Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "RESTRICT AUTOMERGE Prevent accessing companion records from arbitrary uids" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-01 20:08:11 +00:00
committed by Android (Google) Code Review
parent 41d1927c3f 98f45443e1
commit 2ffbce4ef6
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/res/AndroidManifest.xml
View File

@@ -2730,6 +2730,11 @@
<permission android:name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS" <permission android:name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS"
android:protectionLevel="signature|privileged" /> 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. <!-- @SystemApi Allows an application to use SurfaceFlinger's low level features.
<p>Not for use by third-party applications. <p>Not for use by third-party applications.
@hide @hide

5
services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
View File

@@ -623,6 +623,11 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
+ "associate USER_ID PACKAGE MAC_ADDRESS\n" + "associate USER_ID PACKAGE MAC_ADDRESS\n"
+ "disassociate USER_ID PACKAGE MAC_ADDRESS"; + "disassociate USER_ID PACKAGE MAC_ADDRESS";
ShellCmd() {
getContext().enforceCallingOrSelfPermission(
android.Manifest.permission.MANAGE_COMPANION_DEVICES, "ShellCmd");
}
@Override @Override
public int onCommand(String cmd) { public int onCommand(String cmd) {
switch (cmd) { switch (cmd) {