diff options
| author | Alan Newberger <alann@google.com> | 2015-07-08 18:11:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-08 18:11:50 +0000 |
| commit | f2bdf2767617415e476ecab683e1fc05704174e7 (patch) | |
| tree | 9e35ca7c34d8cbfb87b3c4df40b1ef7c9df697b4 /src | |
| parent | ccb925b17d751735427c44e05acc871b02d0028e (diff) | |
| parent | c2d5d078821ca5e8de0c0d03b6603bf7c505c53f (diff) | |
| download | android_packages_apps_Camera2-f2bdf2767617415e476ecab683e1fc05704174e7.tar.gz android_packages_apps_Camera2-f2bdf2767617415e476ecab683e1fc05704174e7.tar.bz2 android_packages_apps_Camera2-f2bdf2767617415e476ecab683e1fc05704174e7.zip | |
am c2d5d078: Restrict permission checks to M devices
* commit 'c2d5d078821ca5e8de0c0d03b6603bf7c505c53f':
Restrict permission checks to M devices
Diffstat (limited to 'src')
| -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); + } } |