am dd334be9: Camera M permissions: lockscreen improvements
* commit 'dd334be92c5513a06c809ee3ea25e411dfad0589':
Camera M permissions: lockscreen improvements
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c5fdb66..df88cfd 100644
--- 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
--- a/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java
+++ b/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java
@@ -40,10 +40,8 @@
*/
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.