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

Commit 27151bb8 authored by Richard MacGregor's avatar Richard MacGregor
Browse files

Add default role holder config for test role 

Add default role holder config for
RESERVED_FOR_TESTING_PROFILE_GROUP_EXCLUSIVITY role

Bug: 379143798
Test: build
Flag: android.permission.flags.cross_user_role_platform_api_enabled
Change-Id: Ice2af6fa090ca04e573519816264796f491e59bc
parent b511fa5b

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -516,6 +516,7 @@ package android { 
    field public static final int config_defaultCallScreening = 17039398; // 0x1040026

    field public static final int config_defaultDialer = 17039395; // 0x1040023

    field public static final int config_defaultNotes = 17039429; // 0x1040045

    field @FlaggedApi("android.permission.flags.cross_user_role_platform_api_enabled") public static final int config_defaultReservedForTestingProfileGroupExclusivity;

    field @FlaggedApi("android.permission.flags.retail_demo_role_enabled") public static final int config_defaultRetailDemo = 17039432; // 0x1040048

    field public static final int config_defaultSms = 17039396; // 0x1040024

    field @FlaggedApi("android.permission.flags.wallet_role_enabled") public static final int config_defaultWallet = 17039433; // 0x1040049

core/java/android/permission/flags.aconfig

+9 −0
Original line number Diff line number Diff line
@@ -463,3 +463,12 @@ flag { 
    description: "Enables text classifier for OTP detection that is updatable from mainline module"

    bug: "377229653"

}



flag {

    name: "cross_user_role_platform_api_enabled"

    is_exported: true

    is_fixed_read_only: true

    namespace: "permissions"

    description: "Enable cross-user roles platform API"

    bug: "367732307"

}

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -2451,6 +2451,9 @@ 
    <string name="config_systemCallStreaming" translatable="false"></string>

    <!-- The name of the package that will hold the default retail demo role. -->

    <string name="config_defaultRetailDemo" translatable="false"></string>

    <!-- The name of the package that will hold the default reserved for testing profile group

         exclusivity role. -->

    <string name="config_defaultReservedForTestingProfileGroupExclusivity" translatable="false">android.app.rolemultiuser.cts.app</string>



    <!-- The component name of the wear service class that will be started by the system server. -->

    <string name="config_wearServiceComponent" translatable="false"></string>

core/res/res/values/public-staging.xml

+3 −0
Original line number Diff line number Diff line
@@ -151,6 +151,9 @@ 
    <!-- @FlaggedApi(android.content.pm.Flags.FLAG_SDK_DEPENDENCY_INSTALLER)

         @hide @SystemApi -->

    <public name="config_systemDependencyInstaller" />

    <!-- @FlaggedApi(android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_PLATFORM_API_ENABLED)

         @hide @SystemApi -->

    <public name="config_defaultReservedForTestingProfileGroupExclusivity" />

  </staging-public-group>



  <staging-public-group type="dimen" first-id="0x01b30000">