diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-04-19 15:59:20 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-19 15:59:20 -0700 |
| commit | 875f0643164e2235de7256c0a256f9f4c8768fa2 (patch) | |
| tree | 3bcbeffbb0e145992b9d0878174312ce881a9714 /core/res | |
| parent | 27e2fa43dbb4ebf2824a21a6c5f05c8b45513f52 (diff) | |
| parent | 35be7560300a97fc3675bdd325910f28827d9508 (diff) | |
| download | frameworks_base-875f0643164e2235de7256c0a256f9f4c8768fa2.zip frameworks_base-875f0643164e2235de7256c0a256f9f4c8768fa2.tar.gz frameworks_base-875f0643164e2235de7256c0a256f9f4c8768fa2.tar.bz2 | |
Merge "Move SystemUI out of system UID."
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/AndroidManifest.xml | 8 | ||||
| -rwxr-xr-x | core/res/res/values/strings.xml | 5 |
2 files changed, 13 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index f5c0f8f..b7ee2ec 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -737,6 +737,14 @@ android:label="@string/permlab_removeTasks" android:description="@string/permdesc_removeTasks" /> + <!-- Allows an application to start any activity, regardless of permission + protection or exported state. @hide --> + <permission android:name="android.permission.START_ANY_ACTIVITY" + android:permissionGroup="android.permission-group.SYSTEM_TOOLS" + android:protectionLevel="signature" + android:label="@string/permlab_startAnyActivity" + android:description="@string/permdesc_startAnyActivity" /> + <!-- @hide Change the screen compatibility mode of applications --> <permission android:name="android.permission.SET_SCREEN_COMPATIBILITY" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index e00986c..7df24a2 100755 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -538,6 +538,11 @@ tasks and kill their apps. Malicious apps may disrupt the behavior of other apps.</string> + <!-- Title of an application permission, allowing an application to start any activity, regardless of permission protection or exported state. --> + <string name="permlab_startAnyActivity">start any activity</string> + <!-- Description of an application permission, allowing an application to start any activity, regardless of permission protection or exported state. --> + <string name="permdesc_startAnyActivity">Allows the app to start any activity, regardless of permission protection or exported state.</string> + <!-- Title of an application permission, allowing control of app screen compatibility mode --> <string name="permlab_setScreenCompatibility">set screen compatibility</string> <!-- Description of an application permission, allowing control of app screen compatibility mode --> |