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

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

Merge "p2p: make CONFIGURE_WIFI_DISPLAY permission public"

parents 1e9071b1 d2d25b6a

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ package android { 
    field public static final String CHANGE_WIFI_MULTICAST_STATE = "android.permission.CHANGE_WIFI_MULTICAST_STATE";

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

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

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

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

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

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

core/api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ package android { 
    field public static final String COMPANION_APPROVE_WIFI_CONNECTIONS = "android.permission.COMPANION_APPROVE_WIFI_CONNECTIONS";

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

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

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

    field @Deprecated public static final String CONNECTIVITY_INTERNAL = "android.permission.CONNECTIVITY_INTERNAL";

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

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

core/res/AndroidManifest.xml

+3 −4
Original line number Diff line number Diff line
@@ -4867,11 +4867,10 @@ 
    <permission android:name="android.permission.DISABLE_INPUT_DEVICE"

        android:protectionLevel="signature" />



    <!-- Allows an application to configure and connect to Wifi displays

         @hide

         @SystemApi -->

    <!-- Allows an application to configure and connect to Wifi displays -->

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

        android:protectionLevel="signature" />

        android:protectionLevel="signature|knownSigner"

        android:knownCerts="@array/wifi_known_signers" />



    <!-- Allows an application to control low-level features of Wifi displays

         such as opening an RTSP socket.  This permission should only be used