Merge "Improved debug messages" (9476cca9) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -2094,7 +2094,7 @@ public class DataConnection extends StateMachine {

		mDisabledApnTypeBitMask \|= getDisallowedApnTypes();

		mNetworkAgent = DcNetworkAgent.createDcNetworkAgent(DataConnection.this,
		mNetworkAgent = new DcNetworkAgent(DataConnection.this,
		mPhone, mNetworkInfo, mScore, misc, factorySerialNumber, mTransportType);
		}

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

+5 −31

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ import com.android.internal.util.IndentingPrintWriter;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.concurrent.atomic.AtomicInteger;

		/**
		* This class represents a network agent which is communication channel between
		@@ -66,23 +65,20 @@ public class DcNetworkAgent extends NetworkAgent {

		private final LocalLog mNetCapsLocalLog = new LocalLog(50);

		private static AtomicInteger sSerialNumber = new AtomicInteger(0);

		private NetworkInfo mNetworkInfo;

		private DcNetworkAgent(DataConnection dc, String tag, Phone phone, NetworkInfo ni,
		int score, NetworkMisc misc, int factorySerialNumber,
		int transportType) {
		super(dc.getHandler().getLooper(), phone.getContext(), tag, ni,
		DcNetworkAgent(DataConnection dc, Phone phone, NetworkInfo ni, int score, NetworkMisc misc,
		int factorySerialNumber, int transportType) {
		super(dc.getHandler().getLooper(), phone.getContext(), "DcNetworkAgent", ni,
		dc.getNetworkCapabilities(), dc.getLinkProperties(), score, misc,
		factorySerialNumber);
		mTag = tag;
		mTag = "DcNetworkAgent" + "-" + netId;
		mPhone = phone;
		mNetworkCapabilities = dc.getNetworkCapabilities();
		mTransportType = transportType;
		mDataConnection = dc;
		mNetworkInfo = ni;
		logd(tag + " created for data connection " + dc.getName());
		logd(mTag + " created for data connection " + dc.getName());
		}

		/**
		@@ -92,28 +88,6 @@ public class DcNetworkAgent extends NetworkAgent {
		return mTag;
		}

		/**
		* Constructor
		*
		* @param dc The data connection owns this network agent.
		* @param phone The phone object.
		* @param ni Network info.
		* @param score Score of the data connection.
		* @param misc The miscellaneous information of the data connection.
		* @param factorySerialNumber Serial number of telephony network factory.
		* @param transportType The transport of the data connection.
		* @return The network agent
		*/
		public static DcNetworkAgent createDcNetworkAgent(DataConnection dc, Phone phone,
		NetworkInfo ni, int score, NetworkMisc misc,
		int factorySerialNumber, int transportType) {
		// Use serial number only. Do not use transport type because it can be transferred to
		// a different transport.
		String tag = "DcNetworkAgent-" + sSerialNumber.incrementAndGet();
		return new DcNetworkAgent(dc, tag, phone, ni, score, misc, factorySerialNumber,
		transportType);
		}

		/**
		* Set the data connection that owns this network agent.
		*