diff options
| author | Alan Newberger <alann@google.com> | 2015-07-08 18:36:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-08 18:36:59 +0000 |
| commit | e2a6302cc3e897b73c4dc8e629d2f747cf679390 (patch) | |
| tree | 55862a03092f5a1c261ad8cb137978256cf1fbad | |
| parent | 342ebca36172e67dfcb6d7c96f61765ab4075d4f (diff) | |
| parent | b462c3ca45c1daafa1b2bb4461959b55734cf544 (diff) | |
| download | android_packages_apps_Camera2-e2a6302cc3e897b73c4dc8e629d2f747cf679390.tar.gz android_packages_apps_Camera2-e2a6302cc3e897b73c4dc8e629d2f747cf679390.tar.bz2 android_packages_apps_Camera2-e2a6302cc3e897b73c4dc8e629d2f747cf679390.zip | |
am b462c3ca: am f2bdf276: am c2d5d078: Restrict permission checks to M devices
* commit 'b462c3ca45c1daafa1b2bb4461959b55734cf544':
Restrict permission checks to M devices
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 5 | ||||
| -rw-r--r-- | src/com/android/camera/util/ApiHelper.java | 5 |
2 files changed, 10 insertions, 0 deletions
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); + } } |