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

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

Merge "Rename computer control access permission" into main

parents 958e4b4e 6d0e10a7

core/java/android/companion/virtual/IVirtualDeviceManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ interface IVirtualDeviceManager { 
            in VirtualDeviceParams params, in IVirtualDeviceActivityListener activityListener,

            in IVirtualDeviceSoundEffectListener soundEffectListener);



    @EnforcePermission("COMPUTER_CONTROL_ACCESS")

    @EnforcePermission("ACCESS_COMPUTER_CONTROL")

    IVirtualDevice createLocalVirtualDevice(

            in IBinder token, in AttributionSource attributionSource,

            in VirtualDeviceParams params, in IVirtualDeviceActivityListener activityListener,

core/java/android/companion/virtual/VirtualDeviceInternal.java

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ public class VirtualDeviceInternal { 
                mSoundEffectListener);

    }



    @RequiresPermission(Manifest.permission.COMPUTER_CONTROL_ACCESS)

    @RequiresPermission(Manifest.permission.ACCESS_COMPUTER_CONTROL)

    VirtualDeviceInternal(

            IVirtualDeviceManager service,

            Context context,

core/java/android/companion/virtual/VirtualDeviceManager.java

+2 −2
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ public final class VirtualDeviceManager { 
    /**

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.COMPUTER_CONTROL_ACCESS)

    @RequiresPermission(android.Manifest.permission.ACCESS_COMPUTER_CONTROL)

    @NonNull

    public VirtualDevice createVirtualDevice(@NonNull VirtualDeviceParams params) {

        Objects.requireNonNull(params, "params must not be null");
@@ -587,7 +587,7 @@ public final class VirtualDeviceManager { 
                    new VirtualDeviceInternal(service, context, associationId, params);

        }



        @RequiresPermission(Manifest.permission.COMPUTER_CONTROL_ACCESS)

        @RequiresPermission(Manifest.permission.ACCESS_COMPUTER_CONTROL)

        private VirtualDevice(

                IVirtualDeviceManager service,

                Context context,

core/res/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -8578,9 +8578,9 @@ 


    <!-- Allows an application access to computer control features.

     @hide -->

    <permission android:name="android.permission.COMPUTER_CONTROL_ACCESS"

    <permission android:name="android.permission.ACCESS_COMPUTER_CONTROL"

        android:protectionLevel="internal|knownSigner"

        android:knownCerts="@array/config_computerControlAccessKnownSigners"

        android:knownCerts="@array/config_accessComputerControlKnownSigners"

        android:featureFlag="android.companion.virtualdevice.flags.computer_control_access"/>



    <!-- @SystemApi Must be required by a safety source to send an update using the

core/res/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -7257,7 +7257,7 @@ 
    <!-- Certificate digests for trusted apps that will be allowed to obtain the knownSigner

         permission for computer control access. The digest should be computed over the

         DER encoding of the trusted certificate using the SHA-256 digest algorithm. -->

    <string-array name="config_computerControlAccessKnownSigners">

    <string-array name="config_accessComputerControlKnownSigners">

    </string-array>



    <!-- Certificate digests for trusted apps that will be allowed to obtain the knownSigner