Merge changes from topic "phone_switcher_new_package" (f78c4832) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,8 @@ import android.telephony.TelephonyManager;
		import android.util.LocalLog;

		import com.android.internal.telephony.cdma.CdmaSubscriptionSourceManager;
		import com.android.internal.telephony.data.CellularNetworkValidator;
		import com.android.internal.telephony.data.PhoneSwitcher;
		import com.android.internal.telephony.data.TelephonyNetworkFactory;
		import com.android.internal.telephony.euicc.EuiccCardController;
		import com.android.internal.telephony.euicc.EuiccController;

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import android.telephony.TelephonyManager;
		import android.util.Log;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telephony.data.PhoneSwitcher;
		import com.android.telephony.Rlog;

		import java.util.ArrayList;

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

+43 −17

Original line number	Diff line number	Diff line
		@@ -93,7 +93,7 @@ import com.android.internal.telephony.cdma.EriManager;
		import com.android.internal.telephony.cdnr.CarrierDisplayNameData;
		import com.android.internal.telephony.cdnr.CarrierDisplayNameResolver;
		import com.android.internal.telephony.data.DataNetwork;
		import com.android.internal.telephony.data.DataNetworkController;
		import com.android.internal.telephony.data.DataNetworkController.DataNetworkControllerCallback;
		import com.android.internal.telephony.dataconnection.DataConnection;
		import com.android.internal.telephony.dataconnection.DcTracker;
		import com.android.internal.telephony.dataconnection.TransportManager;
		@@ -284,6 +284,7 @@ public class ServiceStateTracker extends Handler {
		// Timeout event used when delaying radio power off to wait for IMS deregistration to happen.
		private static final int EVENT_POWER_OFF_RADIO_IMS_DEREG_TIMEOUT = 62;
		protected static final int EVENT_RESET_LAST_KNOWN_CELL_IDENTITY = 63;
		private static final int EVENT_REGISTER_DATA_NETWORK_EXISTING_CHANGED = 64;

		/**
		* The current service state.
		@@ -614,6 +615,13 @@ public class ServiceStateTracker extends Handler {
		/* Last known TAC/LAC */
		private int mLastKnownAreaCode = CellInfo.UNAVAILABLE;

		/**
		* Indicating if there is any data network existing. This is used in airplane mode turning on
		* scenario, where service state tracker should wait all data disconnected before powering
		* down the modem.
		*/
		private boolean mAnyDataExisting = false;

		public ServiceStateTracker(GsmCdmaPhone phone, CommandsInterface ci) {
		mNitzState = TelephonyComponentFactory.getInstance()
		.inject(NitzStateMachine.class.getName())
		@@ -709,6 +717,10 @@ public class ServiceStateTracker extends Handler {
		CarrierServiceStateTracker.CARRIER_EVENT_DATA_DEREGISTRATION, null);
		registerForImsCapabilityChanged(mCSST,
		CarrierServiceStateTracker.CARRIER_EVENT_IMS_CAPABILITIES_CHANGED, null);

		if (mPhone.isUsingNewDataStack()) {
		sendEmptyMessage(EVENT_REGISTER_DATA_NETWORK_EXISTING_CHANGED);
		}
		}

		@VisibleForTesting
		@@ -1456,15 +1468,33 @@ public class ServiceStateTracker extends Handler {
		}
		break;

		case EVENT_REGISTER_DATA_NETWORK_EXISTING_CHANGED: {
		mPhone.getDataNetworkController().registerDataNetworkControllerCallback(
		new DataNetworkControllerCallback(this::post) {
		@Override
		public void onAnyDataNetworkExistingChanged(boolean anyDataExisting) {
		if (mAnyDataExisting != anyDataExisting) {
		mAnyDataExisting = anyDataExisting;
		log("onAnyDataNetworkExistingChanged: anyDataExisting="
		+ anyDataExisting);
		if (!mAnyDataExisting) {
		sendEmptyMessage(EVENT_ALL_DATA_DISCONNECTED);
		}
		}
		}
		});
		break;
		}
		case EVENT_ALL_DATA_DISCONNECTED:
		if (mPhone.isUsingNewDataStack()) {
		log("EVENT_ALL_DATA_DISCONNECTED");
		if (mPendingRadioPowerOffAfterDataOff) {
		mPendingRadioPowerOffAfterDataOff = false;
		removeMessages(EVENT_SET_RADIO_POWER_OFF);
		if (DBG) log("EVENT_ALL_DATA_DISCONNECTED, turn radio off now.");
		hangupAndPowerOff();
		return;
		}
		return;
		}
		int dds = SubscriptionManager.getDefaultDataSubscriptionId();
		ProxyController.getInstance().unregisterForAllDataDisconnected(dds, this);
		@@ -4908,21 +4938,16 @@ public class ServiceStateTracker extends Handler {
		synchronized (this) {
		if (!mPendingRadioPowerOffAfterDataOff) {
		if (mPhone.isUsingNewDataStack()) {
		mPhone.getDataNetworkController().registerDataNetworkControllerCallback(
		this::post,
		new DataNetworkController.DataNetworkControllerCallback() {
		@Override
		public void onAllDataNetworksDisconnected() {
		sendEmptyMessage(EVENT_ALL_DATA_DISCONNECTED);
		}
		// One time callback. If all data networks are already disconnected
		// upon registration, the callback will be invoked immediately.
		}, true);
		if (mAnyDataExisting) {
		log("powerOffRadioSafely: Tear down all data networks.");
		mPhone.getDataNetworkController().tearDownAllDataNetworks(
		DataNetwork.TEAR_DOWN_REASON_AIRPLANE_MODE_ON);
		sendEmptyMessageDelayed(EVENT_SET_RADIO_POWER_OFF,
		POWER_OFF_ALL_DATA_NETWORKS_DISCONNECTED_TIMEOUT);
		} else {
		log("powerOffRadioSafely: No data is connected.");
		sendEmptyMessage(EVENT_ALL_DATA_DISCONNECTED);
		}
		mPendingRadioPowerOffAfterDataOff = true;
		return;
		}
		@@ -5235,6 +5260,7 @@ public class ServiceStateTracker extends Handler {
		dumpCellInfoList(pw);
		pw.flush();
		pw.println(" mAllowedNetworkTypes=" + mAllowedNetworkTypes);
		pw.println(" mAnyDataExisting=" + mAnyDataExisting);
		pw.println(" mMaxDataCalls=" + mMaxDataCalls);
		pw.println(" mNewMaxDataCalls=" + mNewMaxDataCalls);
		pw.println(" mReasonDataDenied=" + mReasonDataDenied);

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -72,6 +72,7 @@ import com.android.ims.ImsManager;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telephony.IccCardConstants.State;
		import com.android.internal.telephony.data.DataEnabledOverride;
		import com.android.internal.telephony.data.PhoneSwitcher;
		import com.android.internal.telephony.metrics.TelephonyMetrics;
		import com.android.internal.telephony.uicc.IccUtils;
		import com.android.internal.telephony.uicc.UiccCard;
		@@ -4677,7 +4678,7 @@ public class SubscriptionController extends ISub.Stub {
		/**
		* @hide
		*/
		protected static void invalidateActiveDataSubIdCaches() {
		public static void invalidateActiveDataSubIdCaches() {
		if (sCachingEnabled) {
		SubscriptionManager.invalidateActiveDataSubIdCaches();
		}

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ import com.android.internal.telephony.cdma.EriManager;
		import com.android.internal.telephony.data.AccessNetworksManager;
		import com.android.internal.telephony.data.DataNetworkController;
		import com.android.internal.telephony.data.LinkBandwidthEstimator;
		import com.android.internal.telephony.data.PhoneSwitcher;
		import com.android.internal.telephony.dataconnection.DataEnabledSettings;
		import com.android.internal.telephony.dataconnection.DcTracker;
		import com.android.internal.telephony.dataconnection.TransportManager;