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

RESTRICT AUTOMERGE

Browse Source 
Prevent accessing companion records from arbitrary uids

Test: manual
Fixes: 129476618
Change-Id: I7b18cfcdf58e62a445cbb508116c6ce7c1cea8d7
This commit is contained in:
Eugene Susla
2019-03-28 13:50:17 -07:00
committed by Sterling Huber
parent 3d4cf34685
commit b4aaa9d8ad
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/res/AndroidManifest.xml
View File

@@ -3518,6 +3518,11 @@
<permission android:name="android.permission.OBSERVE_ROLE_HOLDERS" <permission android:name="android.permission.OBSERVE_ROLE_HOLDERS"
android:protectionLevel="signature|installer" /> 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. <!-- @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

1
packages/Shell/AndroidManifest.xml
View File

@@ -181,6 +181,7 @@
<uses-permission android:name="android.permission.READ_CLIPBOARD_IN_BACKGROUND" /> <uses-permission android:name="android.permission.READ_CLIPBOARD_IN_BACKGROUND" />
<!-- Permission needed to wipe the device for Test Harness Mode --> <!-- Permission needed to wipe the device for Test Harness Mode -->
<uses-permission android:name="android.permission.ENABLE_TEST_HARNESS_MODE" /> <uses-permission android:name="android.permission.ENABLE_TEST_HARNESS_MODE" />
<uses-permission android:name="android.permission.MANAGE_COMPANION_DEVICES" />
<uses-permission android:name="android.permission.MANAGE_APPOPS" /> <uses-permission android:name="android.permission.MANAGE_APPOPS" />

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

@@ -660,6 +660,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) {