Merge changes Id3366236,Ie794c236 (b5289e8c) · Commits · e / os / android_frameworks_opt_telephony

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

+47 −2

Original line number	Diff line number	Diff line
		@@ -92,6 +92,8 @@ import com.android.internal.telephony.cdma.EriInfo;
		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.dataconnection.DataConnection;
		import com.android.internal.telephony.dataconnection.DcTracker;
		import com.android.internal.telephony.dataconnection.TransportManager;
		@@ -124,6 +126,7 @@ import java.util.HashSet;
		import java.util.LinkedList;
		import java.util.List;
		import java.util.Set;
		import java.util.concurrent.TimeUnit;
		import java.util.regex.Matcher;
		import java.util.regex.Pattern;
		import java.util.stream.Collectors;
		@@ -224,6 +227,12 @@ public class ServiceStateTracker extends Handler {
		/** Waiting period before recheck gprs and voice registration. */
		public static final int DEFAULT_GPRS_CHECK_PERIOD_MILLIS = 60 * 1000;

		/**
		* The timer value to wait for all data networks to be torn down.
		*/
		private static final long POWER_OFF_ALL_DATA_NETWORKS_DISCONNECTED_TIMEOUT =
		TimeUnit.SECONDS.toMillis(10);

		/** GSM events */
		protected static final int EVENT_RADIO_STATE_CHANGED = 1;
		protected static final int EVENT_NETWORK_STATE_CHANGED = 2;
		@@ -1162,6 +1171,12 @@ public class ServiceStateTracker extends Handler {
		switch (msg.what) {
		case EVENT_SET_RADIO_POWER_OFF:
		synchronized(this) {
		if (mPhone.isUsingNewDataStack()) {
		mPendingRadioPowerOffAfterDataOff = false;
		log("Wait for all data networks torn down timed out. Power off now.");
		hangupAndPowerOff();
		return;
		}
		if (mPendingRadioPowerOffAfterDataOff &&
		(msg.arg1 == mPendingRadioPowerOffAfterDataOffTag)) {
		if (DBG) log("EVENT_SET_RADIO_OFF, turn radio off now.");
		@@ -1439,6 +1454,15 @@ public class ServiceStateTracker extends Handler {
		break;

		case EVENT_ALL_DATA_DISCONNECTED:
		if (mPhone.isUsingNewDataStack()) {
		if (mPendingRadioPowerOffAfterDataOff) {
		mPendingRadioPowerOffAfterDataOff = false;
		removeMessages(EVENT_SET_RADIO_POWER_OFF);
		if (DBG) log("EVENT_ALL_DATA_DISCONNECTED, turn radio off now.");
		hangupAndPowerOff();
		return;
		}
		}
		int dds = SubscriptionManager.getDefaultDataSubscriptionId();
		ProxyController.getInstance().unregisterForAllDataDisconnected(dds, this);
		synchronized(this) {
		@@ -3033,13 +3057,14 @@ public class ServiceStateTracker extends Handler {
		} else if ((!mDesiredPowerState \|\| mRadioDisabledByCarrier) && mCi.getRadioState()
		== TelephonyManager.RADIO_POWER_ON) {
		// If it's on and available and we want it off gracefully
		if (mImsRegistrationOnOff && getRadioPowerOffDelayTimeoutForImsRegistration() > 0) {
		if (!mPhone.isUsingNewDataStack() && mImsRegistrationOnOff
		&& getRadioPowerOffDelayTimeoutForImsRegistration() > 0) {
		if (DBG) log("setPowerStateToDesired: delaying power off until IMS dereg.");
		startDelayRadioOffWaitingForImsDeregTimeout();
		// Return early here as we do not want to hit the cancel timeout code below.
		return;
		} else {
		if (DBG) log("setPowerStateToDesired: powering off");
		if (DBG) log("setPowerStateToDesired: powerOffRadioSafely()");
		powerOffRadioSafely();
		}
		} else if (mDeviceShuttingDown
		@@ -4860,6 +4885,25 @@ public class ServiceStateTracker extends Handler {
		public void powerOffRadioSafely() {
		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);
		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);
		mPendingRadioPowerOffAfterDataOff = true;
		return;
		}
		int dds = SubscriptionManager.getDefaultDataSubscriptionId();
		// To minimize race conditions we call cleanUpAllConnections on
		// both if else paths instead of before this isDisconnected test.
		@@ -4966,6 +5010,7 @@ public class ServiceStateTracker extends Handler {
		* Hang up all voice call and turn off radio. Implemented by derived class.
		*/
		protected void hangupAndPowerOff() {
		if (mCi.getRadioState() == TelephonyManager.RADIO_POWER_OFF) return;
		// hang up all active voice calls
		if (!mPhone.isPhoneTypeGsm() \|\| mPhone.isInCall()) {
		mPhone.mCT.mRingingCall.hangupIfAlive();

src/java/com/android/internal/telephony/data/DataConfigManager.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;
		import android.util.IndentingPrintWriter;

		import com.android.internal.R;
		import com.android.internal.telephony.Phone;
		import com.android.internal.telephony.data.DataRetryManager.DataRetryRule;
		import com.android.telephony.Rlog;
		@@ -229,6 +230,14 @@ public class DataConfigManager extends Handler {
		return null;
		}

		/**
		* @return The delay in millisecond for IMS graceful tear down. If IMS/RCS de-registration
		* does not complete within the window, the data network will be torn down after timeout.
		*/
		public long getImsDeregistrationDelay() {
		return mResources.getInteger(R.integer.config_delay_for_ims_dereg_millis);
		}

		/**
		* Registration point for subscription info ready
		*

src/java/com/android/internal/telephony/data/DataNetwork.java

+37 −5

Original line number	Diff line number	Diff line
		@@ -80,6 +80,7 @@ import java.util.ArrayList;
		import java.util.Collections;
		import java.util.List;
		import java.util.Objects;
		import java.util.function.Consumer;

		/**
		* DataNetwork class represents a single PDN (Packet Data Network).
		@@ -1303,14 +1304,45 @@ public class DataNetwork extends StateMachine {
		}

		private void onTearDown(@TearDownReason int reason) {
		log("onTearDown: reason=" + tearDownReasonToString(reason));
		if (shouldPerformGracefulTearDown()) {
		logd("Performing graceful tear down. Wait for IMS/RCS de-registered.");
		return;
		}
		logl("onTearDown: reason=" + tearDownReasonToString(reason));
		// TODO: Need to support DataService.REQUEST_REASON_SHUTDOWN
		mDataServiceManagers.get(mTransport).deactivateDataCall(mCid.get(mTransport),
		DataService.REQUEST_REASON_NORMAL, null);
		mInvokedDataDeactivation = true;
		}

		/**
		* Tear down the data network when condition is met or timed out. Data network will enter
		* {@link DisconnectingState} immediately and waiting for condition met. When condition is met,
		* {@link DataNetworkController} should invoke {@link Consumer#accept(Object)} so the actual
		* tear down work can be performed.
		*
		* This is primarily used for IMS graceful tear down. {@link DataNetworkController} inform
		* {@link DataNetwork} to enter {@link DisconnectingState}. IMS service can observe this
		* through {@link PreciseDataConnectionState#getState()} and then perform IMS de-registration
		* work. After IMS de-registered, {@link DataNetworkController} informs {@link DataNetwork}
		* that it's okay to tear down the network.
		*
		* @param reason The tear down reason.
		*
		* @param timeoutMillis Timeout in milliseconds. Within the time window, clients will have to
		* call {@link Consumer#accept(Object)}, otherwise, data network will be torn down when
		* timed out.
		*
		* @return The runnable for client to execute when condition is met. When executed, tear down
		* will be performed. {@code null} if the data network is already disconnected or being
		* disconnected.
		*/
		public @Nullable Runnable tearDownWithCondition(@TearDownReason int reason,
		long timeoutMillis) {
		if (getCurrentState() == null \|\| isDisconnected() \|\| isDisconnecting()) {
		loge("tearDownGracefully: Not in the right state. State=" + getCurrentState());
		return null;
		}
		logl("tearDownWithCondition: reason=" + tearDownReasonToString(reason) + ", timeout="
		+ timeoutMillis + "ms.");
		sendMessageDelayed(EVENT_TEAR_DOWN_NETWORK, timeoutMillis);
		return () -> this.tearDown(reason);
		}

		/**