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

Commit accd8333 authored by Richard MacGregor's avatar Richard MacGregor Committed by Android (Google) Code Review
Browse files

Merge "Revert "Add default role holder config for test role"" into main

parents 2d7e3028 33044bf8

core/api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -522,7 +522,6 @@ package android { 
    field @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence_module") public static final int config_defaultOnDeviceIntelligenceDeviceConfigNamespace;

    field @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence_module") public static final int config_defaultOnDeviceIntelligenceService;

    field @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence_module") public static final int config_defaultOnDeviceSandboxedInferenceService;

    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

+0 −9
Original line number Diff line number Diff line
@@ -466,15 +466,6 @@ flag { 
    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"

}



flag {

    name: "rate_limit_batched_note_op_async_callbacks_enabled"

    is_fixed_read_only: true

core/res/res/values/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -2466,9 +2466,6 @@ 
    <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

+2 −3
Original line number Diff line number Diff line
@@ -151,9 +151,8 @@ 
    <!-- @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" />

    <!-- @hide @SystemApi -->

    <public name="removed_config_defaultReservedForTestingProfileGroupExclusivity" />

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

         @hide @SystemApi -->

    <public name="config_systemVendorIntelligence" />