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

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

Merge "Add defaultRetailDemo config for the default holder of Retail Demo role." into main

parents dc180e5e 1c585f0e

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -455,6 +455,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 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/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -2309,6 +2309,8 @@ 
    <string name="config_systemFinancedDeviceController" translatable="false">com.android.devicelockcontroller</string>

    <!-- The name of the package that will hold the call streaming role. -->

    <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 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 −0
Original line number Diff line number Diff line
@@ -119,6 +119,8 @@ 
  </staging-public-group>



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

    <!-- @hide @SystemApi -->

    <public name="config_defaultRetailDemo" />

  </staging-public-group>



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