Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a61cad1c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents eff24fc8 b4aaa9d8

core/res/AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -3518,6 +3518,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

packages/Shell/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ 
    <uses-permission android:name="android.permission.READ_CLIPBOARD_IN_BACKGROUND" />

    <!-- 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.MANAGE_COMPANION_DEVICES" />



    <uses-permission android:name="android.permission.MANAGE_APPOPS" />

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+5 −0
Original line number Diff line number Diff line
@@ -660,6 +660,11 @@ public class CompanionDeviceManagerService extends SystemService implements Bind 
                + "associate USER_ID PACKAGE MAC_ADDRESS\n"

                + "disassociate USER_ID PACKAGE MAC_ADDRESS";



        ShellCmd() {

            getContext().enforceCallingOrSelfPermission(

                    android.Manifest.permission.MANAGE_COMPANION_DEVICES, "ShellCmd");

        }



        @Override

        public int onCommand(String cmd) {

            switch (cmd) {