commit 27357872c4c943d60d9b2e8a5e09ec63b9e12f28
author Hall Liu <hallliu@google.com> Fri Apr 06 17:53:24 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Apr 06 17:53:24 2018 -0700
tree a19d3c7b24caa55655a75ab6854eb6cf8011919e
parent be7d612eb3d449caa587fe04769556a4d05a69c2
parent 668300083eafb4d9f37fe6ef2837fe44416ad472

Merge changes from topic "rtt-settings-change-cp"
am: 668300083e

Change-Id: If05a3f29730cede46254f38280065c465e9da613

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c9281d1..529082b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -79,10 +79,10 @@
     <protected-broadcast android:name= "com.android.phone.vvm.ACTION_VISUAL_VOICEMAIL_SERVICE_EVENT" />
     <protected-broadcast android:name= "com.android.internal.telephony.CARRIER_VVM_PACKAGE_INSTALLED" />
     <protected-broadcast android:name= "com.android.cellbroadcastreceiver.GET_LATEST_CB_AREA_INFO" />
+    <protected-broadcast android:name= "android.intent.action.CURRENT_CARRIER_IDENTITY_CHANGED" />
     <protected-broadcast android:name= "android.telephony.action.SIM_CARD_STATE_CHANGED" />
     <protected-broadcast android:name= "android.telephony.action.SIM_APPLICATION_STATE_CHANGED" />
     <protected-broadcast android:name= "android.telephony.action.SIM_SLOT_STATUS_CHANGED" />
-    <protected-broadcast android:name= "android.telephony.action.SUBSCRIPTION_CARRIER_IDENTITY_CHANGED" />
 
     <uses-permission android:name="android.permission.BROADCAST_STICKY" />
     <uses-permission android:name="android.permission.CALL_PHONE" />