diff options
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
-rw-r--r-- | src/com/android/camera/CameraActivity.java | 5 |
1 files changed, 5 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 && |