Merge "send default sub change broadcast in multisim mode" into qt-dev (18c6b441) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/SubscriptionController.java

+15 −2

Original line number	Diff line number	Diff line
		@@ -2088,6 +2088,7 @@ public class SubscriptionController extends ISub.Stub {
		int previousSetting = Settings.Global.getInt(mContext.getContentResolver(),
		Settings.Global.MULTI_SIM_VOICE_CALL_SUBSCRIPTION,
		SubscriptionManager.DEFAULT_SUBSCRIPTION_ID);
		int previousDefaultSub = getDefaultSubId();

		Settings.Global.putInt(mContext.getContentResolver(),
		Settings.Global.MULTI_SIM_VOICE_CALL_SUBSCRIPTION, subId);
		@@ -2109,6 +2110,10 @@ public class SubscriptionController extends ISub.Stub {
		logd("[setDefaultVoiceSubId] default phone account not changed");
		}
		}

		if (previousDefaultSub != getDefaultSubId()) {
		sendDefaultChangedBroadcast(getDefaultSubId());
		}
		}

		/**
		@@ -2192,10 +2197,14 @@ public class SubscriptionController extends ISub.Stub {
		// FIXME is this still needed?
		updateAllDataConnectionTrackers();

		int previousDefaultSub = getDefaultSubId();
		Settings.Global.putInt(mContext.getContentResolver(),
		Settings.Global.MULTI_SIM_DATA_CALL_SUBSCRIPTION, subId);
		MultiSimSettingController.getInstance().notifyDefaultDataSubChanged();
		broadcastDefaultDataSubIdChanged(subId);
		if (previousDefaultSub != getDefaultSubId()) {
		sendDefaultChangedBroadcast(getDefaultSubId());
		}
		} finally {
		Binder.restoreCallingIdentity(identity);
		}
		@@ -2237,6 +2246,7 @@ public class SubscriptionController extends ISub.Stub {
		logdl("[setDefaultFallbackSubId] subId=" + subId + ", subscriptionType="
		+ subscriptionType);
		}
		int previousDefaultSub = getDefaultSubId();
		if (isSubscriptionForRemoteSim(subscriptionType)) {
		mDefaultFallbackSubId = subId;
		return;
		@@ -2250,7 +2260,6 @@ public class SubscriptionController extends ISub.Stub {
		// Update MCC MNC device configuration information
		String defaultMccMnc = mTelephonyManager.getSimOperatorNumericForPhone(phoneId);
		MccTable.updateMccMncConfiguration(mContext, defaultMccMnc);
		sendDefaultChangedBroadcast(phoneId, subId);
		} else {
		if (DBG) {
		logdl("[setDefaultFallbackSubId] not set invalid phoneId=" + phoneId
		@@ -2258,10 +2267,14 @@ public class SubscriptionController extends ISub.Stub {
		}
		}
		}
		if (previousDefaultSub != getDefaultSubId()) {
		sendDefaultChangedBroadcast(getDefaultSubId());
		}
		}

		private void sendDefaultChangedBroadcast(int phoneId, int subId) {
		public void sendDefaultChangedBroadcast(int subId) {
		// Broadcast an Intent for default sub change
		int phoneId = SubscriptionManager.getPhoneId(subId);
		Intent intent = new Intent(TelephonyIntents.ACTION_DEFAULT_SUBSCRIPTION_CHANGED);
		intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING
		\| Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -631,6 +631,9 @@ public class SubscriptionInfoUpdater extends Handler {
		}
		// update default subId
		MultiSimSettingController.getInstance().notifyAllSubscriptionLoaded();
		// broadcast default subId
		SubscriptionController.getInstance().sendDefaultChangedBroadcast(
		SubscriptionManager.getDefaultSubscriptionId());
		}

		SubscriptionController.getInstance().notifySubscriptionInfoChanged();