diff options
author | Svetoslav Ganov <svetoslavganov@google.com> | 2012-05-16 18:31:36 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-16 18:31:36 -0700 |
commit | 56ee04e1208b00ee24f753a5cbe09fcef2facf12 (patch) | |
tree | fcf9f77f50604bc7cdd17fc3731076088b9d15b2 | |
parent | 5de47b6ad9d72476302f8a3732b639d3d413ef77 (diff) | |
parent | e63049b838e94379ba1dae3137198bc3ddf5f19d (diff) | |
download | frameworks_base-56ee04e1208b00ee24f753a5cbe09fcef2facf12.zip frameworks_base-56ee04e1208b00ee24f753a5cbe09fcef2facf12.tar.gz frameworks_base-56ee04e1208b00ee24f753a5cbe09fcef2facf12.tar.bz2 |
Merge "Adding some missing files." into jb-dev
-rw-r--r-- | core/res/AndroidManifest.xml | 7 | ||||
-rwxr-xr-x | core/res/res/values/strings.xml | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index dbc60f9..04a29e7 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1551,6 +1551,13 @@ android:description="@string/permdesc_bindInputMethod" android:protectionLevel="signature" /> + <!-- Must be required by an {@link android.accessibilityservice.AccessibilityService}, + to ensure that only the system can bind to it. --> + <permission android:name="android.permission.BIND_ACCESSIBILITY_SERVICE" + android:label="@string/permlab_bindAccessibilityService" + android:description="@string/permdesc_bindAccessibilityService" + android:protectionLevel="signature" /> + <!-- Must be required by a TextService (e.g. SpellCheckerService) to ensure that only the system can bind to it. --> <permission android:name="android.permission.BIND_TEXT_SERVICE" diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 687a00b..4511201 100755 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -846,6 +846,12 @@ interface of an input method. Should never be needed for normal apps.</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_bindAccessibilityService">bind to an accessibility service</string> + <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permdesc_bindAccessibilityService">Allows the holder to bind to the top-level + interface of an accessibility service. Should never be needed for normal apps.</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_bindTextService">bind to a text service</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_bindTextService">Allows the holder to bind to the top-level |