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

Commit a1b2904d authored by Omar Eissa's avatar Omar Eissa Committed by Android (Google) Code Review
Browse files

Merge "Add DETECT_SCREEN_CAPTURE permission."

parents 991dd46e 05c5a6c9

core/api/current.txt

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

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

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

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

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

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

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

core/res/AndroidManifest.xml

+13 −0
Original line number Diff line number Diff line
@@ -2533,6 +2533,19 @@ 
        android:description="@string/permdesc_modifyAudioSettings"

        android:protectionLevel="normal" />



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

    <!-- Permissions related to screen capture   -->

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

    <eat-comment />



    <!-- Allows an application to get notified when a screen capture of its windows is attempted.

         <p>Protection level: normal

    -->

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

                android:label="@string/permlab_detectScreenCapture"

                android:description="@string/permdesc_detectScreenCapture"

                android:protectionLevel="normal" />



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

    <!-- Permissions for factory reset protection -->

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

core/res/res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -1302,6 +1302,11 @@ 
    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=NONE] -->

    <string name="permdesc_recordBackgroundAudio">This app can record audio using the microphone at any time.</string>



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

    <string name="permlab_detectScreenCapture">detect screen captures of app windows</string>

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

    <string name="permdesc_detectScreenCapture">This app will get notified when a screenshot is taken while the app is in use.</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_sim_communication">send commands to the SIM</string>

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