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

Commit f3f3615a authored by Wentao Wang's avatar Wentao Wang Committed by Android (Google) Code Review
Browse files

Merge "Add feature flag for defaultRetailDemo resource." into main

parents d9f03d71 7db062a6

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,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 public static final int config_defaultRetailDemo;

    field @FlaggedApi("android.permission.flags.retail_demo_role_enabled") public static final int config_defaultRetailDemo;

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

    field public static final int config_devicePolicyManagement = 17039421; // 0x104003d

    field public static final int config_feedbackIntentExtraKey = 17039391; // 0x104001f

core/java/android/permission/flags.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -64,3 +64,10 @@ flag { 
  description: "enable Permission PREPARE_FACTORY_RESET."

  bug: "302016478"

}



flag {

    name: "retail_demo_role_enabled"

    namespace: "permissions"

    description: "default retail demo role holder"

    bug: "274132354"

}

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

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ 
  </staging-public-group>



  <staging-public-group type="string" first-id="0x01ba0000">

    <!-- @hide @SystemApi -->

    <!-- @hide @SystemApi @FlaggedApi("android.permission.flags.retail_demo_role_enabled") -->

    <public name="config_defaultRetailDemo" />

  </staging-public-group>