commit 76b13c5abe7f7fd8fa4adfc3c95c07171a8e72d8
author Amit Mahajan <amitmahajan@google.com> Thu Jan 25 02:44:18 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 25 02:44:18 2018 +0000
tree 97f6a5e423fb32b2de3bd9614142f137e99a081b
parent bc4f6c9095788d268ee4425640118a45ceb4912d
parent d9a9b4f7f9a6e5a60a669704e34762dd6bb0d1b5

Merge "Include phoneId in carrier config changed broadcast as public extra key"
am: d9a9b4f7f9

Change-Id: I9b2ea3fb2de7c3583808f2e12dae99ca72424339

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index df006e2..1b1327f 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -516,6 +516,7 @@
         intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT |
                 Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
         SubscriptionManager.putPhoneIdAndSubIdExtra(intent, phoneId);
+        intent.putExtra(CarrierConfigManager.EXTRA_SLOT_INDEX, phoneId);
         ActivityManager.broadcastStickyIntent(intent, UserHandle.USER_ALL);
         mHasSentConfigChange[phoneId] = true;
     }