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

Commit c98c3597 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Hide permissions that are not available to apps."

parents 05083e57 24a12104

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -90,10 +90,8 @@ package android { 
    field public static final java.lang.String RECEIVE_SMS = "android.permission.RECEIVE_SMS";

    field public static final java.lang.String RECEIVE_WAP_PUSH = "android.permission.RECEIVE_WAP_PUSH";

    field public static final java.lang.String RECORD_AUDIO = "android.permission.RECORD_AUDIO";

    field public static final java.lang.String REMOVE_TASKS = "android.permission.REMOVE_TASKS";

    field public static final java.lang.String REORDER_TASKS = "android.permission.REORDER_TASKS";

    field public static final deprecated java.lang.String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES";

    field public static final java.lang.String RETRIEVE_WINDOW_CONTENT = "android.permission.RETRIEVE_WINDOW_CONTENT";

    field public static final java.lang.String SEND_SMS = "android.permission.SEND_SMS";

    field public static final java.lang.String SET_ACTIVITY_WATCHER = "android.permission.SET_ACTIVITY_WATCHER";

    field public static final java.lang.String SET_ALARM = "com.android.alarm.permission.SET_ALARM";

core/res/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ 
        android:label="@string/permlab_reorderTasks"

        android:description="@string/permdesc_reorderTasks" />



    <!-- Allows an application to change to remove/kill tasks -->

    <!-- @hide Allows an application to change to remove/kill tasks -->

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

        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"

        android:protectionLevel="signature"
@@ -711,7 +711,7 @@ 
        android:label="@string/permlab_dump"

        android:description="@string/permdesc_dump" />



    <!-- Allows an application to retrieve the content of the active window

    <!-- @hide Allows an application to retrieve the content of the active window

         An active window is the window that has fired an accessibility event. -->

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

        android:permissionGroup="android.permission-group.PERSONAL_INFO"