Merge "Setup getActiveDataSubscriptionId cache invalidation" (a2189c54) · Commits · e / os / android_frameworks_opt_telephony

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

+21 −11

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@ import android.telephony.data.ApnSetting;
		import android.util.LocalLog;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telephony.SubscriptionController.WatchedInt;
		import com.android.internal.telephony.dataconnection.DcRequest;
		import com.android.internal.telephony.metrics.TelephonyMetrics;
		import com.android.internal.telephony.nano.TelephonyProto.TelephonyEvent;
		@@ -213,7 +214,14 @@ public class PhoneSwitcher extends Handler {
		protected int mPreferredDataPhoneId = SubscriptionManager.INVALID_PHONE_INDEX;

		// Subscription ID corresponds to mPreferredDataPhoneId.
		private int mPreferredDataSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
		private WatchedInt mPreferredDataSubId =
		new WatchedInt(SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
		@Override
		public void set(int newValue) {
		super.set(newValue);
		SubscriptionController.invalidateActiveDataSubIdCaches();
		}
		};

		// If non-null, An emergency call is about to be started, is ongoing, or has just ended and we
		// are overriding the DDS.
		@@ -311,6 +319,7 @@ public class PhoneSwitcher extends Handler {
		public static PhoneSwitcher make(int maxDataAttachModemCount, Context context, Looper looper) {
		if (sPhoneSwitcher == null) {
		sPhoneSwitcher = new PhoneSwitcher(maxDataAttachModemCount, context, looper);
		SubscriptionController.invalidateActiveDataSubIdCaches();
		}

		return sPhoneSwitcher;
		@@ -440,10 +449,10 @@ public class PhoneSwitcher extends Handler {
		}
		case EVENT_PRIMARY_DATA_SUB_CHANGED: {
		if (onEvaluate(REQUESTS_UNCHANGED, "primary data subId changed")) {
		logDataSwitchEvent(mPreferredDataSubId,
		logDataSwitchEvent(mPreferredDataSubId.get(),
		TelephonyEvent.EventState.EVENT_STATE_START,
		DataSwitch.Reason.DATA_SWITCH_REASON_MANUAL);
		registerDefaultNetworkChangeCallback(mPreferredDataSubId,
		registerDefaultNetworkChangeCallback(mPreferredDataSubId.get(),
		DataSwitch.Reason.DATA_SWITCH_REASON_MANUAL);
		}
		break;
		@@ -514,10 +523,10 @@ public class PhoneSwitcher extends Handler {
		// fall through
		case EVENT_DATA_ENABLED_CHANGED:
		if (onEvaluate(REQUESTS_UNCHANGED, "EVENT_PRECISE_CALL_STATE_CHANGED")) {
		logDataSwitchEvent(mPreferredDataSubId,
		logDataSwitchEvent(mPreferredDataSubId.get(),
		TelephonyEvent.EventState.EVENT_STATE_START,
		DataSwitch.Reason.DATA_SWITCH_REASON_IN_CALL);
		registerDefaultNetworkChangeCallback(mPreferredDataSubId,
		registerDefaultNetworkChangeCallback(mPreferredDataSubId.get(),
		DataSwitch.Reason.DATA_SWITCH_REASON_IN_CALL);
		}
		break;
		@@ -1065,7 +1074,8 @@ public class PhoneSwitcher extends Handler {
		mPreferredDataPhoneId = phoneId;
		}

		mPreferredDataSubId = mSubscriptionController.getSubIdUsingPhoneId(mPreferredDataPhoneId);
		mPreferredDataSubId.set(
		mSubscriptionController.getSubIdUsingPhoneId(mPreferredDataPhoneId));
		}

		private void transitionToEmergencyPhone() {
		@@ -1079,8 +1089,8 @@ public class PhoneSwitcher extends Handler {
		mPreferredDataPhoneId = DEFAULT_EMERGENCY_PHONE_ID;
		}

		if (mPreferredDataSubId != INVALID_SUBSCRIPTION_ID) {
		mPreferredDataSubId = INVALID_SUBSCRIPTION_ID;
		if (mPreferredDataSubId.get() != INVALID_SUBSCRIPTION_ID) {
		mPreferredDataSubId.set(INVALID_SUBSCRIPTION_ID);
		notifyPreferredDataSubIdChanged();
		}
		}
		@@ -1355,15 +1365,15 @@ public class PhoneSwitcher extends Handler {
		private void notifyPreferredDataSubIdChanged() {
		TelephonyRegistryManager telephonyRegistryManager = (TelephonyRegistryManager) mContext
		.getSystemService(Context.TELEPHONY_REGISTRY_SERVICE);
		log("notifyPreferredDataSubIdChanged to " + mPreferredDataSubId);
		telephonyRegistryManager.notifyActiveDataSubIdChanged(mPreferredDataSubId);
		log("notifyPreferredDataSubIdChanged to " + mPreferredDataSubId.get());
		telephonyRegistryManager.notifyActiveDataSubIdChanged(mPreferredDataSubId.get());
		}

		/**
		* @return The active data subscription id
		*/
		public int getActiveDataSubId() {
		return mPreferredDataSubId;
		return mPreferredDataSubId.get();
		}

		// TODO (b/148396668): add an internal callback method to monitor phone capability change,

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

+19 −4

Original line number	Diff line number	Diff line
		@@ -249,13 +249,18 @@ public class SubscriptionController extends ISub.Stub {

		public void set(int newValue) {
		mValue = newValue;
		invalidateDefaultSubIdCaches();
		}
		}

		private static WatchedSlotIndexToSubIds sSlotIndexToSubIds = new WatchedSlotIndexToSubIds();
		protected static WatchedInt sDefaultFallbackSubId =
		new WatchedInt(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
		new WatchedInt(SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
		@Override
		public void set(int newValue) {
		super.set(newValue);
		invalidateDefaultSubIdCaches();
		}
		};

		@UnsupportedAppUsage
		private static int mDefaultPhoneId = SubscriptionManager.DEFAULT_PHONE_INDEX;
		@@ -333,6 +338,7 @@ public class SubscriptionController extends ISub.Stub {
		// Initial invalidate activates caching.
		invalidateDefaultSubIdCaches();
		invalidateDefaultDataSubIdCaches();
		invalidateActiveDataSubIdCaches();

		if (DBG) logdl("[SubscriptionController] init by Context");
		}
		@@ -4056,6 +4062,7 @@ public class SubscriptionController extends ISub.Stub {
		Settings.Global.putInt(mContext.getContentResolver(), name, value);
		if (name == Settings.Global.MULTI_SIM_DATA_CALL_SUBSCRIPTION) {
		invalidateDefaultDataSubIdCaches();
		invalidateActiveDataSubIdCaches();
		invalidateDefaultSubIdCaches();
		} else if (name == Settings.Global.MULTI_SIM_VOICE_CALL_SUBSCRIPTION) {
		invalidateDefaultSubIdCaches();
		@@ -4080,6 +4087,15 @@ public class SubscriptionController extends ISub.Stub {
		}
		}

		/**
		* @hide
		*/
		protected static void invalidateActiveDataSubIdCaches() {
		if (sCachingEnabled) {
		SubscriptionManager.invalidateActiveDataSubIdCaches();
		}
		}

		/**
		* @hide
		*/
		@@ -4091,9 +4107,8 @@ public class SubscriptionController extends ISub.Stub {
		/**
		* @hide
		*/
		@VisibleForTesting
		public static void enableCaching() {
		sCachingEnabled = true;
		}


		}