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

Commit 28f2e1df 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 pi-dev

parents 34aafa29 84cccfe6

core/res/AndroidManifest.xml

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

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

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