summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-08-01 12:23:47 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-01 12:23:47 -0700
commitc98c3597abf90ff547e1543923cba937e268a7df (patch)
treeed21b2c0ad44dc0921bcbdb335c51253c45de181 /core
parent05083e572478a3948fa740cba078486cd9de5c98 (diff)
parent24a12104fd09ad8658b8d8af1f8efce4ec1c6701 (diff)
downloadframeworks_base-c98c3597abf90ff547e1543923cba937e268a7df.zip
frameworks_base-c98c3597abf90ff547e1543923cba937e268a7df.tar.gz
frameworks_base-c98c3597abf90ff547e1543923cba937e268a7df.tar.bz2
Merge "Hide permissions that are not available to apps."
Diffstat (limited to 'core')
-rw-r--r--core/res/AndroidManifest.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 92ba1d0..e6589e6 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -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"