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

Commit 876c8803 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add permission role SYSTEM_WIFI_COEX_MANAGER" into sc-dev

parents b6ada90d 9c83a2b6

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ package android { 
    field public static final int config_systemGallery = 17039399; // 0x1040027

    field public static final int config_systemShell = 17039402; // 0x104002a

    field public static final int config_systemSpeechRecognizer = 17039406; // 0x104002e

    field public static final int config_systemWifiCoexManager = 17039407; // 0x104002f

  }















  public static final class R.style {

































core/res/AndroidManifest.xml



+3
−3




























Original line number
Diff line number
Diff line








@@ -1876,15 +1876,15 @@













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















        android:protectionLevel="signature|privileged" />





























    <!-- @SystemApi @hide Allows system APK to update Wifi/Cellular coex channels to avoid.













    <!-- @SystemApi @hide Allows applications to update Wifi/Cellular coex channels to avoid.















             <p>Not for use by third-party applications. -->















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













        android:protectionLevel="signature" />













        android:protectionLevel="signature|role" />































    <!-- @SystemApi @hide Allows applications to access Wifi/Cellular coex channels being avoided.















         <p>Not for use by third-party applications. -->















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













                android:protectionLevel="signature|privileged" />













        android:protectionLevel="signature|role" />































    <!-- @SystemApi @hide Allows system APK to manage country code.















             <p>Not for use by third-party applications. -->

































core/res/res/values/config.xml



+2
−0




























Original line number
Diff line number
Diff line








@@ -1964,6 +1964,8 @@













    <string name="config_systemContacts" translatable="false">com.android.contacts</string>















    <!-- The name of the package that will hold the speech recognizer role by default. -->















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













    <!-- The name of the package that will hold the system Wi-Fi coex manager role. -->













    <string name="config_systemWifiCoexManager" translateable="false"></string>































    <!-- The name of the package that will be allowed to change its components' label/icon. -->















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

































core/res/res/values/public.xml



+2
−0




























Original line number
Diff line number
Diff line








@@ -3168,6 +3168,8 @@













    <public name="config_customMediaSessionPolicyProvider" />















    <!-- @hide @SystemApi -->















    <public name="config_systemSpeechRecognizer" />













    <!-- @hide @SystemApi -->













    <public name="config_systemWifiCoexManager" />















  </public-group>































  <public-group type="id" first-id="0x01020055">