Hook CarrierConfigLoader<->SubscriptionInfoUpdater
Add an extra step when CarrierConfigLoader loads
a config to inform the SubInfoUpdater and allow time
for changes to Subscriptions before the
CARRIER_CONFIG_CHANGE broadcast is sent.
Bug: 123721160
Test: manual
Merged-In: I59319a89f5e778a30175dc3763639ed1c4a3ebf2
Change-Id: I59319a89f5e778a30175dc3763639ed1c4a3ebf2
(cherry picked from commit 17daf21ec691eaa5cf6541c3450fdb4c24e154d3)
diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 061efef..b3e5b11 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -55,6 +55,7 @@
import com.android.internal.telephony.IccCardConstants;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneFactory;
+import com.android.internal.telephony.SubscriptionInfoUpdater;
import com.android.internal.telephony.TelephonyPermissions;
import com.android.internal.util.FastXmlSerializer;
import com.android.internal.util.IndentingPrintWriter;
@@ -100,6 +101,8 @@
private CarrierServiceConnection[] mServiceConnection;
// Whether we have sent config change bcast for each phone id.
private boolean[] mHasSentConfigChange;
+ // SubscriptionInfoUpdater
+ private final SubscriptionInfoUpdater mSubscriptionInfoUpdater;
// Broadcast receiver for Boot intents, register intent filter in construtor.
private final BroadcastReceiver mBootReceiver = new ConfigLoaderBroadcastReceiver();
@@ -137,6 +140,8 @@
private static final int EVENT_FETCH_DEFAULT_TIMEOUT = 14;
// Fetching config timed out from a carrier app.
private static final int EVENT_FETCH_CARRIER_TIMEOUT = 15;
+ // SubscriptionInfoUpdater has finished updating the sub for the carrier config.
+ private static final int EVENT_SUBSCRIPTION_INFO_UPDATED = 16;
private static final int BIND_TIMEOUT_MILLIS = 30000;
@@ -243,7 +248,7 @@
BIND_TIMEOUT_MILLIS);
} else {
// Send broadcast if bind fails.
- broadcastConfigChangedIntent(phoneId);
+ notifySubscriptionInfoUpdater(phoneId);
// TODO: We *must* call unbindService even if bindService returns false.
// (And possibly if SecurityException was thrown.)
loge("binding to default app: "
@@ -278,7 +283,7 @@
if (resultCode == RESULT_ERROR || resultData == null) {
// On error, abort config fetching.
loge("Failed to get carrier config");
- broadcastConfigChangedIntent(phoneId);
+ notifySubscriptionInfoUpdater(phoneId);
return;
}
PersistableBundle config =
@@ -320,6 +325,7 @@
removeMessages(EVENT_FETCH_DEFAULT_TIMEOUT);
broadcastConfigChangedIntent(phoneId);
loge("bind/fetch time out from " + mPlatformCarrierConfigPackage);
+ notifySubscriptionInfoUpdater(phoneId);
break;
}
@@ -336,7 +342,7 @@
log("Found carrier config app: " + carrierPackageName);
sendMessage(obtainMessage(EVENT_DO_FETCH_CARRIER, phoneId, -1));
} else {
- broadcastConfigChangedIntent(phoneId);
+ notifySubscriptionInfoUpdater(phoneId);
}
break;
}
@@ -370,6 +376,7 @@
// Send broadcast if bind fails.
broadcastConfigChangedIntent(phoneId);
loge("bind to carrier app: " + carrierPackageName + " fails");
+ notifySubscriptionInfoUpdater(phoneId);
}
}
break;
@@ -402,6 +409,7 @@
loge("Failed to get carrier config from carrier app: "
+ getCarrierPackageForPhoneId(phoneId));
broadcastConfigChangedIntent(phoneId);
+ notifySubscriptionInfoUpdater(phoneId);
return;
}
PersistableBundle config =
@@ -442,6 +450,7 @@
removeMessages(EVENT_FETCH_CARRIER_TIMEOUT);
broadcastConfigChangedIntent(phoneId);
loge("bind/fetch from carrier app timeout");
+ notifySubscriptionInfoUpdater(phoneId);
break;
}
@@ -453,7 +462,7 @@
&& mServiceConnection[phoneId] == null) {
break;
}
- broadcastConfigChangedIntent(phoneId);
+ notifySubscriptionInfoUpdater(phoneId);
break;
}
@@ -476,6 +485,10 @@
}
break;
}
+
+ case EVENT_SUBSCRIPTION_INFO_UPDATED:
+ broadcastConfigChangedIntent(phoneId);
+ break;
}
}
}
@@ -514,6 +527,7 @@
// Make this service available through ServiceManager.
ServiceManager.addService(Context.CARRIER_CONFIG_SERVICE, this);
log("CarrierConfigLoader has started");
+ mSubscriptionInfoUpdater = PhoneFactory.getSubscriptionInfoUpdater();
mHandler.sendEmptyMessage(EVENT_CHECK_SYSTEM_UPDATE);
}
@@ -534,6 +548,24 @@
}
}
+ private void notifySubscriptionInfoUpdater(int phoneId) {
+ String configPackagename;
+ PersistableBundle configToSend;
+ int carrierId = getSpecificCarrierIdForPhoneId(phoneId);
+ // Prefer the carrier privileged carrier app, but if there is not one, use the platform
+ // default carrier app.
+ if (mConfigFromCarrierApp[phoneId] != null) {
+ configPackagename = getCarrierPackageForPhoneId(phoneId);
+ configToSend = mConfigFromCarrierApp[phoneId];
+ } else {
+ configPackagename = mPlatformCarrierConfigPackage;
+ configToSend = mConfigFromDefaultApp[phoneId];
+ }
+ mSubscriptionInfoUpdater.updateSubscriptionByCarrierConfigAndNotifyComplete(
+ phoneId, configPackagename, configToSend,
+ mHandler.obtainMessage(EVENT_SUBSCRIPTION_INFO_UPDATED, phoneId, -1));
+ }
+
private void broadcastConfigChangedIntent(int phoneId) {
broadcastConfigChangedIntent(phoneId, true);
}