diff options
| author | Kevin F. Haggerty <haggertk@lineageos.org> | 2020-05-05 07:27:40 -0600 |
|---|---|---|
| committer | Kevin F. Haggerty <haggertk@lineageos.org> | 2020-05-05 07:27:40 -0600 |
| commit | 5df8608656b363f13049855431e2618dd153edaf (patch) | |
| tree | 86fbabfd8a6b3a8ea13600745f92bdc24df3f7b3 /core/res/AndroidManifest.xml | |
| parent | e740651c8005fa64e0f022fb33c711a72a4acbcc (diff) | |
| parent | 39c9bf27471f6454202236f88c247fef4c4b2b2e (diff) | |
| download | android_frameworks_base-5df8608656b363f13049855431e2618dd153edaf.tar.gz android_frameworks_base-5df8608656b363f13049855431e2618dd153edaf.tar.bz2 android_frameworks_base-5df8608656b363f13049855431e2618dd153edaf.zip | |
Merge tag 'android-9.0.0_r56' of https://android.googlesource.com/platform/frameworks/base into staging/lineage-16.0_merge-android-9.0.0_r56lineage-16.0
Android 9.0.0 release 56
* tag 'android-9.0.0_r56' of https://android.googlesource.com/platform/frameworks/base:
Verify all possible hosts that match web nav
RESTRICT AUTOMERGE Prevent accessing companion records from arbitrary uids
Revert "DO NOT MERGE - Kill apps outright for API contract violations"
RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo
RESTRICT AUTOMERGE Create separated tasks for different apps from startActivities
DO NOT MERGE - Kill apps outright for API contract violations
DO NOT MERGE Ensure package names read from config are system packages.
RESTRICT AUTOMERGE Update keyguard locked state from TrustManagerService
Only suspend package from system or shell
Change-Id: I678145bad18e8b34e462cde9f79f2952085f5e55
Diffstat (limited to 'core/res/AndroidManifest.xml')
| -rw-r--r-- | core/res/AndroidManifest.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 34d26f0da90..af1a6fa9e3c 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -3141,6 +3141,11 @@ <permission android:name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS" android:protectionLevel="signature|privileged" /> + <!-- Allows an application to manage the companion devices. + @hide --> + <permission android:name="android.permission.MANAGE_COMPANION_DEVICES" + android:protectionLevel="signature" /> + <!-- @SystemApi Allows an application to use SurfaceFlinger's low level features. <p>Not for use by third-party applications. @hide |