am ac0e2425: Fixes to M permissions.

* commit 'ac0e2425e77a9b69e76d2f31876798825ea44584':
  Fixes to M permissions.

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c5fdb66..df88cfd 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -46,7 +46,8 @@
         android:largeHeap="true"
         android:restoreAnyVersion="true"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Camera" >
+        android:theme="@style/Theme.Camera"
+        android:usesCleartextTraffic="false" >
         <activity
             android:name="com.android.camera.CameraActivity"
             android:clearTaskOnLaunch="true"

diff --git a/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java b/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java
index 8d0b387..0cedb18 100644 (file)
--- a/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java
+++ b/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java
@@ -40,10 +40,8 @@ public class OneCameraFeatureConfigCreator {
      */
     public static OneCameraFeatureConfig createDefault(ContentResolver contentResolver,
             MemoryManager memoryManager) {
-        // Enable CaptureModule on all L devices unless the device is
-        // black-listed.
-        boolean useCaptureModule = ApiHelper.HAS_CAMERA_2_API
-                && !GservicesHelper.isCaptureModuleDisabled(contentResolver);
+        // Enable CaptureModule on all M devices.
+        boolean useCaptureModule = true;
         Log.i(TAG, "CaptureModule? " + useCaptureModule);
 
         // HDR+ has multiple levels of support.