diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-08-01 12:23:47 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-01 12:23:47 -0700 |
| commit | c98c3597abf90ff547e1543923cba937e268a7df (patch) | |
| tree | ed21b2c0ad44dc0921bcbdb335c51253c45de181 | |
| parent | 05083e572478a3948fa740cba078486cd9de5c98 (diff) | |
| parent | 24a12104fd09ad8658b8d8af1f8efce4ec1c6701 (diff) | |
| download | frameworks_base-c98c3597abf90ff547e1543923cba937e268a7df.zip frameworks_base-c98c3597abf90ff547e1543923cba937e268a7df.tar.gz frameworks_base-c98c3597abf90ff547e1543923cba937e268a7df.tar.bz2 | |
Merge "Hide permissions that are not available to apps."
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index f537908..c6775bf 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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"; 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" |