am 0752da22: Merge "add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE" into lmp-mr1-dev

* commit '0752da22c7ea369d28235572963aac48b66bb416':
  add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE
This commit is contained in:
Cheuksan Wang
2014-12-05 19:13:55 +00:00
committed by Android Git Automerger

View File

@@ -2914,7 +2914,8 @@
Any service that filters for this intent must be a carrier privileged app. --> Any service that filters for this intent must be a carrier privileged app. -->
<permission android:name="android.permission.BIND_CARRIER_MESSAGING_SERVICE" <permission android:name="android.permission.BIND_CARRIER_MESSAGING_SERVICE"
android:label="@string/permlab_bindCarrierMessagingService" android:label="@string/permlab_bindCarrierMessagingService"
android:description="@string/permdesc_bindCarrierMessagingService" /> android:description="@string/permdesc_bindCarrierMessagingService"
android:protectionLevel="signature|system" />
<!-- The system process is explicitly the only one allowed to launch the <!-- The system process is explicitly the only one allowed to launch the
confirmation UI for full backup/restore --> confirmation UI for full backup/restore -->