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

Commit 66fec94b authored by Vladimir Komsiyski's avatar Vladimir Komsiyski
Browse files

Add the VDM permissions to shell 

So tests can rely on them instead of the roles

Fix: 391599603
Test: presubmit
Flag: EXEMPT test improvement
Change-Id: I1deb60e799174ed63bb483b8d3fe91bb97f1731d
parent ab4eafb6

packages/Shell/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ android_app { 
        "device_policy_aconfig_flags_lib",

    ],

    flags_packages: [

        "android.companion.virtualdevice.flags-aconfig",

        "android.security.flags-aconfig",

        "android.permission.flags-aconfig",

        "wear_aconfig_declarations",
@@ -55,6 +56,7 @@ android_library { 
    platform_apis: true,

    manifest: "AndroidManifest.xml",

    flags_packages: [

        "android.companion.virtualdevice.flags-aconfig",

        "android.security.flags-aconfig",

        "android.permission.flags-aconfig",

    ],

packages/Shell/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -969,6 +969,13 @@ 
    <uses-permission android:name="android.permission.MANAGE_INTRUSION_DETECTION_STATE"

        android:featureFlag="android.security.afl_api"/>



    <!-- Permissions required for CTS test - CtsVirtualDevicesTestCases -->

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

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

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

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

    <uses-permission android:name="android.permission.ADD_MIRROR_DISPLAY"

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



    <!-- Permission required for CTS test - CtsAppTestCases -->

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

services/tests/servicestests/AndroidManifest.xml

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

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

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

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

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



    <queries>