am 4bf3f39c: am 22172323: Merge "Adds the BIND_CARRIER_MESSAGING_SERVICE permission to the phone process, so that platform telephony components can communicate with the carrier app." into lmp-mr1-dev
* commit '4bf3f39c9d9af8af6ca9b0d2b33bc9676e1a9324':
Adds the BIND_CARRIER_MESSAGING_SERVICE permission to the phone process, so that platform telephony components can communicate with the carrier app.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bebbf6c..bc84bf5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -97,6 +97,7 @@
<uses-permission android:name="android.permission.DUMP" />
<uses-permission android:name="android.permission.REGISTER_CALL_PROVIDER" />
<uses-permission android:name="android.permission.REGISTER_SIM_SUBSCRIPTION" />
+ <uses-permission android:name="android.permission.BIND_CARRIER_MESSAGING_SERVICE" />
<!-- This tells the activity manager to not delay any of our activity
start requests, even if they happen immediately after the user