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

Commit f82b5836 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Add permissions to control and configure wifi display." into jb-mr1-dev

parents 43190793 4b71e4e6

core/res/AndroidManifest.xml

+16 −0
Original line number Diff line number Diff line
@@ -1446,6 +1446,22 @@ 
        android:description="@string/permdesc_readFrameBuffer"

        android:protectionLevel="signature|system" />



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

         @hide -->

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

        android:label="@string/permlab_configureWifiDisplay"

        android:description="@string/permdesc_configureWifiDisplay"

        android:protectionLevel="signature" />



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

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

         by the display manager.

         @hide -->

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

        android:label="@string/permlab_controlWifiDisplay"

        android:description="@string/permdesc_controlWifiDisplay"

        android:protectionLevel="signature" />



    <!-- Required to be able to disable the device (very dangerous!). -->

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

        android:label="@string/permlab_brick"

core/res/res/values/strings.xml

+10 −0
Original line number Diff line number Diff line
@@ -1190,6 +1190,16 @@ 
    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_readFrameBuffer">Allows the app to read the content of the frame buffer.</string>



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_configureWifiDisplay">configure Wifi displays</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_configureWifiDisplay">Allows the app to configure and connect to Wifi displays.</string>



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_controlWifiDisplay">control Wifi displays</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_controlWifiDisplay">Allows the app to control low-level features of Wifi displays.</string>



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_modifyAudioSettings">change your audio settings</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->