yutaaraki-toydium
diff --git a/‎CODEOWNERS
Lines changed: 2 additions & 2 deletions b/‎CODEOWNERS
Lines changed: 2 additions & 2 deletions
diff --git a/‎packages/camera/camera_android/CHANGELOG.md
Lines changed: 4 additions & 0 deletions b/‎packages/camera/camera_android/CHANGELOG.md
Lines changed: 4 additions & 0 deletions
diff --git a/‎packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/DartMessenger.java
Lines changed: 3 additions & 2 deletions b/‎packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/DartMessenger.java
Lines changed: 3 additions & 2 deletions
diff --git a/‎packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/MethodCallHandlerImpl.java
Lines changed: 3 additions & 2 deletions b/‎packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/MethodCallHandlerImpl.java
Lines changed: 3 additions & 2 deletions
diff --git a/‎packages/camera/camera_android/example/integration_test/camera_test.dart
Lines changed: 2 additions & 0 deletions b/‎packages/camera/camera_android/example/integration_test/camera_test.dart
Lines changed: 2 additions & 0 deletions
diff --git a/‎packages/camera/camera_android/lib/camera_android.dart
Lines changed: 5 additions & 0 deletions b/‎packages/camera/camera_android/lib/camera_android.dart
Lines changed: 5 additions & 0 deletions
@@ -26,7 +26,7 @@ packages/webview_flutter/**                              @bparrishMines
 packages/**/*_web/**                                     @ditman
 
 # - Android
-packages/camera/camera/android/**                        @camsim99
+packages/camera/camera_android/**                        @camsim99
 packages/espresso/**                                     @blasten
 packages/flutter_plugin_android_lifecycle/**             @blasten
 packages/google_maps_flutter/google_maps_flutter/android/**  @GaryQian
@@ -40,7 +40,7 @@ packages/url_launcher/url_launcher_android/**            @GaryQian
 packages/video_player/video_player_android/**            @blasten
 
 # - iOS
-packages/camera/camera/ios/**                            @hellohuanlin
+packages/camera/camera_avfoundation/**                   @hellohuanlin
 packages/google_maps_flutter/google_maps_flutter/ios/**  @cyanglaz
 packages/google_sign_in/google_sign_in_ios/**            @jmagman
 packages/image_picker/image_picker_ios/**                @cyanglaz
 
@@ -1,3 +1,7 @@
+## 0.9.8
+
+* Switches to internal method channel implementation.
+
 ## 0.9.7+1
 
 * Splits from `camera` as a federated implementation.
@@ -64,8 +64,9 @@ enum CameraEventType {
    *     the main thread. The handler is mainly supplied so it will be easier test this class.
    */
   DartMessenger(BinaryMessenger messenger, long cameraId, @NonNull Handler handler) {
-    cameraChannel = new MethodChannel(messenger, "flutter.io/cameraPlugin/camera" + cameraId);
-    deviceChannel = new MethodChannel(messenger, "flutter.io/cameraPlugin/device");
+    cameraChannel =
+        new MethodChannel(messenger, "plugins.flutter.io/camera_android/camera" + cameraId);
+    deviceChannel = new MethodChannel(messenger, "plugins.flutter.io/camera_android/fromPlatform");
     this.handler = handler;
   }
 
 
@@ -49,8 +49,9 @@ final class MethodCallHandlerImpl implements MethodChannel.MethodCallHandler {
     this.permissionsRegistry = permissionsAdder;
     this.textureRegistry = textureRegistry;
 
-    methodChannel = new MethodChannel(messenger, "plugins.flutter.io/camera");
-    imageStreamChannel = new EventChannel(messenger, "plugins.flutter.io/camera/imageStream");
+    methodChannel = new MethodChannel(messenger, "plugins.flutter.io/camera_android");
+    imageStreamChannel =
+        new EventChannel(messenger, "plugins.flutter.io/camera_android/imageStream");
     methodChannel.setMethodCallHandler(this);
   }
 
 
@@ -5,6 +5,7 @@
 import 'dart:io';
 import 'dart:ui';
 
+import 'package:camera_android/camera_android.dart';
 import 'package:camera_example/camera_controller.dart';
 import 'package:camera_platform_interface/camera_platform_interface.dart';
 import 'package:flutter/painting.dart';
@@ -19,6 +20,7 @@ void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
   setUpAll(() async {
+    CameraPlatform.instance = AndroidCamera();
     final Directory extDir = await getTemporaryDirectory();
     testDir = await Directory('${extDir.path}/test').create(recursive: true);
   });
 
@@ -0,0 +1,5 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+export 'src/android_camera.dart';