am f2bdf276: am c2d5d078: Restrict permission checks to M devices
* commit 'f2bdf2767617415e476ecab683e1fc05704174e7':
Restrict permission checks to M devices
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 586a66d..8cedeb7 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1875,6 +1875,11 @@
* Non-critical permission is location.
*/
private void checkPermissions() {
+ if (!ApiHelper.isMOrHigher()) {
+ Log.v(TAG, "not running on M, skipping permission checks");
+ mHasCriticalPermissions = true;
+ return;
+ }
if (checkSelfPermission(Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED &&
checkSelfPermission(Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED &&
diff --git a/src/com/android/camera/util/ApiHelper.java b/src/com/android/camera/util/ApiHelper.java
index 6aadc62..1b97553 100644
--- a/src/com/android/camera/util/ApiHelper.java
+++ b/src/com/android/camera/util/ApiHelper.java
@@ -112,4 +112,9 @@
return Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP
|| Build.VERSION.SDK_INT == 22; // Lollipop MR1
}
+
+ public static boolean isMOrHigher() {
+ return Build.VERSION.SDK_INT >= Build.VERSION_CODES.MNC
+ || "MNC".equals(Build.VERSION.CODENAME);
+ }
}