diff options
| author | Lalit Kansara <lkansara@codeaurora.org> | 2016-12-06 14:56:49 +0530 |
|---|---|---|
| committer | Lalit Kansara <lkansara@codeaurora.org> | 2016-12-06 14:56:49 +0530 |
| commit | 14ee72e6db5d7e33d061176e7e6d06e1d0475882 (patch) | |
| tree | 933f97c4bddd3e5408c35a28a24f990095fedefe /AndroidManifest.xml | |
| parent | 7f3bc87a69368ecdc9a27d8c6a21ee4b2d7fd32f (diff) | |
| parent | b26b9425d700359d6ee68d45ac334fd1f2ab82d4 (diff) | |
| download | android_packages_apps_PackageInstaller-14ee72e6db5d7e33d061176e7e6d06e1d0475882.tar.gz android_packages_apps_PackageInstaller-14ee72e6db5d7e33d061176e7e6d06e1d0475882.tar.bz2 android_packages_apps_PackageInstaller-14ee72e6db5d7e33d061176e7e6d06e1d0475882.zip | |
Merge commit 'b26b9425d700359d6ee68d45ac334fd1f2ab82d4' into remote
Conflicts:
src/com/android/packageinstaller/permission/ui/handheld/GrantPermissionsViewHandlerImpl.java
Change-Id: Ia57d17750406754f1e19266f51f0115e3cf774ba
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 39e9f3c7..83364bd6 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -22,9 +22,6 @@ <uses-permission android:name="com.google.android.permission.INSTALL_WEARABLE_PACKAGES" /> - <!-- Needed for passing extras with intent ACTION_SHOW_ADMIN_SUPPORT_DETAILS --> - <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" /> - <application android:label="@string/app_name" android:allowBackup="false" android:theme="@style/Theme.DialogWhenLarge" |