From: Alan Newberger <alann@google.com>
Date: Wed, 8 Jul 2015 16:51:04 +0000 (-0700)
Subject: Restrict permission checks to M devices
X-Git-Tag: android-x86-6.0-r3~3^2^2~21
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fpackages-apps-Camera2.git;a=commitdiff_plain;h=c2d5d078821ca5e8de0c0d03b6603bf7c505c53f

Restrict permission checks to M devices

Add an ApiHelper check and only call checkSelfPermission if we
are on M and the methods exist.

BUG=22345681

Change-Id: Icda8d40057b5492502858ced731a749a2f66abf8
---

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 586a66dd5..8cedeb781 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1875,6 +1875,11 @@ public class CameraActivity extends QuickActivity
      * 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 6aadc6250..1b97553a2 100644
--- a/src/com/android/camera/util/ApiHelper.java
+++ b/src/com/android/camera/util/ApiHelper.java
@@ -112,4 +112,9 @@ public class ApiHelper {
         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);
+    }
 }