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

Commit 3105b3b8 authored by Taesun Yeoum's avatar Taesun Yeoum Committed by Android (Google) Code Review
Browse files

Merge "Add SYSTEM_CALL_STREAMING role related config in xml"

parents 44b660ae 61b2626c

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -463,6 +463,7 @@ package android { 
    field public static final int config_systemAutomotiveCalendarSyncManager = 17039423; // 0x104003f

    field public static final int config_systemAutomotiveCluster = 17039400; // 0x1040028

    field public static final int config_systemAutomotiveProjection = 17039401; // 0x1040029

    field public static final int config_systemCallStreaming;

    field public static final int config_systemCompanionDeviceProvider = 17039417; // 0x1040039

    field public static final int config_systemContacts = 17039403; // 0x104002b

    field public static final int config_systemFinancedDeviceController;

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -5838,7 +5838,7 @@ 
         <p>Not for use by third-party applications.</p>

         @hide -->

    <permission android:name="android.permission.CALL_AUDIO_INTERCEPTION"

                android:protectionLevel="signature|privileged" />

                android:protectionLevel="signature|privileged|role" />



    <!-- @TestApi Allows an application to query audio related state.

         @hide -->

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -2189,6 +2189,8 @@ 
    <bool name="config_enableDefaultNotesForWorkProfile">false</bool>

    <!-- The name of the package that will hold the system financed device controller role. -->

    <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 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
@@ -148,6 +148,8 @@ 
    <public name="config_defaultNotes" />

    <!-- @hide @SystemApi -->

    <public name="config_systemFinancedDeviceController" />

    <!-- @hide @SystemApi -->

    <public name="config_systemCallStreaming" />

  </staging-public-group>



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