diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-04-24 10:19:48 -0700 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2015-04-27 21:16:22 +0000 |
| commit | 4a2423ba5eeee22d38942ead60bfd3bb13f44655 (patch) | |
| tree | f33de9c7e651b530742328947d160046fa0eecf0 /AndroidManifest.xml | |
| parent | 11eae0450b9770bdef3509a620b8c54beba2bab3 (diff) | |
| download | packages_apps_Settings-4a2423ba5eeee22d38942ead60bfd3bb13f44655.tar.gz packages_apps_Settings-4a2423ba5eeee22d38942ead60bfd3bb13f44655.tar.bz2 packages_apps_Settings-4a2423ba5eeee22d38942ead60bfd3bb13f44655.zip | |
Move fingerprint enroll logic into sidecar fragment
So enroll can continue across configuration changes.
Bug: 20495507
Change-Id: I021f2f3e376fcd12c7a698f5fb7f862733cb720a
(cherry picked from commit 64e9c4cb2c7272d07b190cb25c41de5b22563137)
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 0ea75cdca..435236af4 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -75,6 +75,7 @@ <uses-permission android:name="android.permission.OVERRIDE_WIFI_CONFIG" /> <uses-permission android:name="android.permission.USE_FINGERPRINT" /> <uses-permission android:name="android.permission.MANAGE_FINGERPRINT" /> + <uses-permission android:name="android.permission.USER_ACTIVITY" /> <application android:label="@string/settings_label" android:icon="@mipmap/ic_launcher_settings" |