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

Commit f5e2a465 authored by Quang Luong's avatar Quang Luong Committed by Automerger Merge Worker
Browse files

Merge "Add permissions for Wifi coex APIs for CTS tests" am: 37f88d82 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529079

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I84f9368dfa0baf9754fa2e93db9e4fb072f241d4
parents 37f7971d 37f88d82

core/api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -237,7 +237,9 @@ package android { 
    field public static final String USE_RESERVED_DISK = "android.permission.USE_RESERVED_DISK";

    field public static final String WHITELIST_AUTO_REVOKE_PERMISSIONS = "android.permission.WHITELIST_AUTO_REVOKE_PERMISSIONS";

    field public static final String WHITELIST_RESTRICTED_PERMISSIONS = "android.permission.WHITELIST_RESTRICTED_PERMISSIONS";

    field public static final String WIFI_ACCESS_COEX_UNSAFE_CHANNELS = "android.permission.WIFI_ACCESS_COEX_UNSAFE_CHANNELS";

    field public static final String WIFI_SET_DEVICE_MOBILITY_STATE = "android.permission.WIFI_SET_DEVICE_MOBILITY_STATE";

    field public static final String WIFI_UPDATE_COEX_UNSAFE_CHANNELS = "android.permission.WIFI_UPDATE_COEX_UNSAFE_CHANNELS";

    field public static final String WIFI_UPDATE_USABILITY_STATS_SCORE = "android.permission.WIFI_UPDATE_USABILITY_STATS_SCORE";

    field public static final String WRITE_DEVICE_CONFIG = "android.permission.WRITE_DEVICE_CONFIG";

    field public static final String WRITE_DREAM_STATE = "android.permission.WRITE_DREAM_STATE";

core/res/AndroidManifest.xml

+10 −0
Original line number Diff line number Diff line
@@ -1769,6 +1769,16 @@ 
    <permission android:name="android.permission.WIFI_UPDATE_USABILITY_STATS_SCORE"

        android:protectionLevel="signature|privileged" />



    <!-- @SystemApi @hide Allows system APK to update Wifi 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" />



    <!-- @SystemApi @hide Allows applications to access Wifi 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" />



    <!-- ======================================= -->

    <!-- Permissions for short range, peripheral networks -->

    <!-- ======================================= -->