Merge changes from topics "data_settings_manager", "tnf_migrate" am: ec2adbf2f2 (248fdff3) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −1

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

		import com.android.internal.telephony.cdma.CdmaSubscriptionSourceManager;
		import com.android.internal.telephony.dataconnection.TelephonyNetworkFactory;
		import com.android.internal.telephony.data.TelephonyNetworkFactory;
		import com.android.internal.telephony.euicc.EuiccCardController;
		import com.android.internal.telephony.euicc.EuiccController;
		import com.android.internal.telephony.imsphone.ImsPhone;

src/java/com/android/internal/telephony/dataconnection/CellularDataService.java→src/java/com/android/internal/telephony/data/CellularDataService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package com.android.internal.telephony.dataconnection;
		package com.android.internal.telephony.data;

		import static android.telephony.data.DataServiceCallback.RESULT_SUCCESS;

src/java/com/android/internal/telephony/dataconnection/TelephonyNetworkFactory.java→src/java/com/android/internal/telephony/data/TelephonyNetworkFactory.java

+18 −5

Original line number	Diff line number	Diff line
		@@ -14,9 +14,7 @@
		* limitations under the License.
		*/

		package com.android.internal.telephony.dataconnection;

		import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;
		package com.android.internal.telephony.data;

		import android.net.NetworkCapabilities;
		import android.net.NetworkFactory;
		@@ -37,8 +35,12 @@ import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telephony.Phone;
		import com.android.internal.telephony.PhoneSwitcher;
		import com.android.internal.telephony.SubscriptionController;
		import com.android.internal.telephony.dataconnection.ApnContext;
		import com.android.internal.telephony.dataconnection.DataConnection;
		import com.android.internal.telephony.dataconnection.DcTracker;
		import com.android.internal.telephony.dataconnection.DcTracker.ReleaseNetworkType;
		import com.android.internal.telephony.dataconnection.DcTracker.RequestNetworkType;
		import com.android.internal.telephony.dataconnection.TransportManager;
		import com.android.internal.telephony.dataconnection.TransportManager.HandoverParams;
		import com.android.internal.telephony.metrics.NetworkRequestsStats;
		import com.android.internal.util.IndentingPrintWriter;
		@@ -49,6 +51,10 @@ import java.io.PrintWriter;
		import java.util.HashMap;
		import java.util.Map;

		/**
		* Telephony network factory is responsible for dispatching network requests from the connectivity
		* service to the data network controller.
		*/
		public class TelephonyNetworkFactory extends NetworkFactory {
		public final String LOG_TAG;
		protected static final boolean DBG = true;
		@@ -110,7 +116,7 @@ public class TelephonyNetworkFactory extends NetworkFactory {
		mTransportManager.registerForHandoverNeededEvent(mInternalHandler,
		EVENT_DATA_HANDOVER_NEEDED);

		mSubscriptionId = INVALID_SUBSCRIPTION_ID;
		mSubscriptionId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
		SubscriptionManager.from(mPhone.getContext()).addOnSubscriptionsChangedListener(
		mSubscriptionsChangedListener);

		@@ -162,7 +168,7 @@ public class TelephonyNetworkFactory extends NetworkFactory {
		}

		private class InternalHandler extends Handler {
		public InternalHandler(Looper looper) {
		InternalHandler(Looper looper) {
		super(looper);
		}

		@@ -481,6 +487,13 @@ public class TelephonyNetworkFactory extends NetworkFactory {
		mLocalLog.log(s);
		}

		/**
		* Dump the state of telephony network factory
		*
		* @param fd File descriptor
		* @param writer Print writer
		* @param args Arguments
		*/
		public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
		final IndentingPrintWriter pw = new IndentingPrintWriter(writer, " ");
		pw.println("Network Requests:");

src/java/com/android/internal/telephony/dataconnection/ApnContext.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -537,7 +537,13 @@ public class ApnContext {
		return mRetryManager.getRetryAfterDisconnectDelay();
		}

		static @ApnType int getApnTypeFromNetworkRequest(NetworkRequest nr) {
		/**
		* Get APN type from the network request.
		*
		* @param nr The network request.
		* @return The APN type.
		*/
		public static @ApnType int getApnTypeFromNetworkRequest(NetworkRequest nr) {
		// For now, ignore the bandwidth stuff
		if (nr.getTransportTypes().length > 0
		&& !nr.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) {

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -213,14 +213,14 @@ public class DcTracker extends Handler {
		public static final int RELEASE_TYPE_HANDOVER = 3;

		/** The extras for handover completion message */
		static final String DATA_COMPLETE_MSG_EXTRA_NETWORK_REQUEST = "extra_network_request";
		static final String DATA_COMPLETE_MSG_EXTRA_TRANSPORT_TYPE = "extra_transport_type";
		static final String DATA_COMPLETE_MSG_EXTRA_SUCCESS = "extra_success";
		public static final String DATA_COMPLETE_MSG_EXTRA_NETWORK_REQUEST = "extra_network_request";
		public static final String DATA_COMPLETE_MSG_EXTRA_TRANSPORT_TYPE = "extra_transport_type";
		public static final String DATA_COMPLETE_MSG_EXTRA_SUCCESS = "extra_success";
		/**
		* The flag indicates whether after handover failure, the data connection should remain on the
		* original transport.
		*/
		static final String DATA_COMPLETE_MSG_EXTRA_HANDOVER_FAILURE_FALLBACK =
		public static final String DATA_COMPLETE_MSG_EXTRA_HANDOVER_FAILURE_FALLBACK =
		"extra_handover_failure_fallback";

		private final String mLogTag;