diff options
| author | Adam Powell <adamp@google.com> | 2015-03-05 00:07:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-05 00:07:53 +0000 |
| commit | 27b7c1f526b7b0e9dd97566ccf6cbd28bfeab285 (patch) | |
| tree | 45c03090968e027353e60cd583d8fd9ce1225d49 /core/res | |
| parent | c623ec973b5e8d1fd2ff4162d5de8701a6490121 (diff) | |
| parent | e30c9af3566cfa14796144b352230709c7b5647d (diff) | |
| download | frameworks_base-27b7c1f526b7b0e9dd97566ccf6cbd28bfeab285.zip frameworks_base-27b7c1f526b7b0e9dd97566ccf6cbd28bfeab285.tar.gz frameworks_base-27b7c1f526b7b0e9dd97566ccf6cbd28bfeab285.tar.bz2 | |
Merge "Add ChooserTargetService API"
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/AndroidManifest.xml | 8 | ||||
| -rw-r--r-- | 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 b550558..2ce5bb3 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2892,6 +2892,14 @@ android:description="@string/permdesc_bindNotificationListenerService" android:protectionLevel="signature" /> + <!-- Must be required by a {@link + android.service.chooser.ChooserTargetService}, to ensure that + only the system can bind to it. --> + <permission android:name="android.permission.BIND_CHOOSER_TARGET_SERVICE" + android:label="@string/permlab_bindChooserTargetService" + android:description="@string/permdesc_bindChooserTargetService" + android:protectionLevel="signature" /> + <!-- @SystemApi Must be required by a {@link android.service.notification.ConditionProviderService}, to ensure that only the system can bind to it. diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 7c745ac..3f729ce 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -2354,6 +2354,11 @@ <string name="permdesc_bindNotificationListenerService">Allows the holder to bind to the top-level interface of a notification listener 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_bindChooserTargetService">bind to a chooser target 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_bindChooserTargetService">Allows the holder to bind to the top-level interface of a chooser target 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_bindConditionProviderService">bind to a condition provider 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_bindConditionProviderService">Allows the holder to bind to the top-level interface of a condition provider service. Should never be needed for normal apps.</string> |