diff options
| author | Zach Johnson <zachoverflow@google.com> | 2015-05-15 22:40:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-15 22:40:35 +0000 |
| commit | a80282a73385f42be4c2e730690838c92f2870ae (patch) | |
| tree | c1d18ec815fe995cd382a18e284576c7c0725563 /core/res | |
| parent | 0844dcd07034699f3edb0bab4a2ddfc97cc9a25c (diff) | |
| parent | cdaaa91f7c67b2c56f17d5512f015c7c25c7c351 (diff) | |
| download | frameworks_base-a80282a73385f42be4c2e730690838c92f2870ae.zip frameworks_base-a80282a73385f42be4c2e730690838c92f2870ae.tar.gz frameworks_base-a80282a73385f42be4c2e730690838c92f2870ae.tar.bz2 | |
Merge "Create unified BIND_CARRIER_SERVICES permission" into mnc-dev
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/AndroidManifest.xml | 16 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 4 |
2 files changed, 9 insertions, 11 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 4c034b3..79532e4 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2404,8 +2404,7 @@ <permission android:name="android.permission.REMOVE_DRM_CERTIFICATES" android:protectionLevel="signature|system" /> - <!-- Must be required by a {@link android.service.carrier.CarrierMessagingService}. - Any service that filters for this intent must be a carrier privileged app. --> + <!-- @deprecated Use {@link android.Manifest.permission#BIND_CARRIER_SERVICES} instead --> <permission android:name="android.permission.BIND_CARRIER_MESSAGING_SERVICE" android:protectionLevel="signature|system" /> @@ -2427,13 +2426,12 @@ android:permissionGroup="android.permission-group.SYSTEM_TOOLS" android:protectionLevel="signature" /> - <!-- The system process that pulls carrier configuration from carrier apps will - have this permission. Carrier apps that provide - {@link android.service.carrier.CarrierConfigService} should require this - permission for clients binding to their service. --> - <permission android:name="android.permission.BIND_CARRIER_CONFIG_SERVICE" - android:label="@string/permlab_bindCarrierConfigService" - android:description="@string/permdesc_bindCarrierConfigService" + <!-- The system process that is allowed to bind to services in carrier apps will + have this permission. Carrier apps should use this permission to protect + their services that only the system is allowed to bind to. --> + <permission android:name="android.permission.BIND_CARRIER_SERVICES" + android:label="@string/permlab_bindCarrierServices" + android:description="@string/permdesc_bindCarrierServices" android:protectionLevel="signature|system" /> <!-- Allows an application to query whether DO_NOT_ASK_CREDENTIALS_ON_BOOT diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 1c0122d..0e6b2df 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1408,9 +1408,9 @@ <string name="permdesc_bindCarrierMessagingService">Allows the holder to bind to the top-level interface of a carrier messaging 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_bindCarrierConfigService">bind to a carrier config service</string> + <string name="permlab_bindCarrierServices">bind to carrier services</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_bindCarrierConfigService">Allows the holder to bind to a carrier config service. Should never be needed for normal apps.</string> + <string name="permdesc_bindCarrierServices">Allows the holder to bind to carrier services. Should never be needed for normal apps.</string> <!-- Policy administration --> |