summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorliyong <liyong@allwinnertech.com>2021-01-13 16:40:34 +0800
committerandroid-build-prod (mdb) <android-build-team-robot@google.com>2021-02-01 21:40:49 +0000
commitdae0ac29cb1817b83c8ba3d5b60111a357b8392a (patch)
tree17e2f520358332e70988b1db434e8aeb83a9aa1e
parent36b5e22694dbb85c2ab376ab506cdfbfc16831f9 (diff)
downloadcts-dae0ac29cb1817b83c8ba3d5b60111a357b8392a.tar.gz
DO NOT MERGE: Revert "Revert "Prevent accessing companion records from arbitrary uids""
This reverts commit b3b0721e64d842abc4a03fe13e8f98560a03c602. Package android should have permission MANAGE_COMPANION_DEVICES for it's originally set in AOSP. Bug: 177397220 Test: CtsPermission2TestCases:android.permission2.cts.PermissionPolicyTest#platformPermissionPolicyIsUnaltered Change-Id: I5547af1840fff45862da4a45d7d9d7dc97e080bf (cherry picked from commit ad31a3712c2128f9c06ccdfefbab4b336fa9a064)
-rw-r--r--tests/tests/permission2/res/raw/android_manifest.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/tests/permission2/res/raw/android_manifest.xml b/tests/tests/permission2/res/raw/android_manifest.xml
index d91b74f8b0d..e47331ad4e9 100644
--- a/tests/tests/permission2/res/raw/android_manifest.xml
+++ b/tests/tests/permission2/res/raw/android_manifest.xml
@@ -3778,6 +3778,11 @@
<permission android:name="android.permission.OBSERVE_ROLE_HOLDERS"
android:protectionLevel="signature|installer" />
+ <!-- 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