diff options
| author | zafir <zafir@google.com> | 2015-06-29 00:08:22 -0500 |
|---|---|---|
| committer | zafir <zafir@google.com> | 2015-07-06 18:20:51 -0700 |
| commit | ad44cda82fe6ec5ee090115129223c6314f9e1bb (patch) | |
| tree | c5d9c85d389b19b3ed7334c3d7149d5475202725 /AndroidManifest.xml | |
| parent | fd6f316adc5abfa071534642688bdf46f47a3925 (diff) | |
| download | android_packages_apps_Camera2-ad44cda82fe6ec5ee090115129223c6314f9e1bb.tar.gz android_packages_apps_Camera2-ad44cda82fe6ec5ee090115129223c6314f9e1bb.tar.bz2 android_packages_apps_Camera2-ad44cda82fe6ec5ee090115129223c6314f9e1bb.zip | |
Minimum viable Android M runtime permissions handling for H.
Creates new activity for permissions handling: both checking
for permissions and handling error condition when critical
permissions are not present. The reason for creating a
new activity is so the app does not attempt to continue
executing OnCreate, OnResume etc, which opens
the camera while the dialogs are showing. This should
not slow the app down because the permissions activity
will only run when a) the first time the app has
insufficient permissions and b) when a critical
permission is missing and the app needs to shut down.
Bug: 21273463
Change-Id: I603acfb3057ba26b9cfa7935eb4cb24b5d547cb5
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 076863de2..b8816a616 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -6,7 +6,7 @@ <uses-sdk android:minSdkVersion="19" - android:targetSdkVersion="21" /> + android:targetSdkVersion="23" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> @@ -19,7 +19,6 @@ <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" /> <uses-permission android:name="android.permission.NFC" /> - <uses-permission android:name="android.permission.READ_CONTACTS" /> <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="android.permission.RECORD_AUDIO" /> @@ -71,6 +70,15 @@ android:resource="@layout/keyguard_widget" /> </activity> + <activity + android:name="com.android.camera.PermissionsActivity" + android:label="@string/app_name" + android:parentActivityName="com.android.camera.CameraActivity" > + <meta-data + android:name="android.support.PARENT_ACTIVITY" + android:value="com.android.camera.CameraActivity" /> + </activity> + <activity-alias android:name="com.android.camera.CameraLauncher" android:label="@string/app_name" |