Merge "Merged makeNetworkCapabilities and getCopyNetworkCapabilities" into oc-dev (1a4f9e5f) · Commits · e / os / android_frameworks_opt_telephony

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

+7 −11

Original line number	Diff line number	Diff line
		@@ -254,10 +254,6 @@ public class DataConnection extends StateMachine {

		/* Getter functions */

		NetworkCapabilities getCopyNetworkCapabilities() {
		return makeNetworkCapabilities();
		}

		LinkProperties getCopyLinkProperties() {
		return new LinkProperties(mLinkProperties);
		}
		@@ -860,7 +856,7 @@ public class DataConnection extends StateMachine {
		mRestrictedNetworkOverride = (mDct.isDataEnabled(true) == false);
		}

		private NetworkCapabilities makeNetworkCapabilities() {
		NetworkCapabilities getNetworkCapabilities() {
		NetworkCapabilities result = new NetworkCapabilities();
		result.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);

		@@ -1142,7 +1138,7 @@ public class DataConnection extends StateMachine {
		break;
		}
		case DcAsyncChannel.REQ_GET_NETWORK_CAPABILITIES: {
		NetworkCapabilities nc = getCopyNetworkCapabilities();
		NetworkCapabilities nc = getNetworkCapabilities();
		if (VDBG) log("REQ_GET_NETWORK_CAPABILITIES networkCapabilities" + nc);
		mAc.replyToMessage(msg, DcAsyncChannel.RSP_GET_NETWORK_CAPABILITIES, nc);
		break;
		@@ -1204,7 +1200,7 @@ public class DataConnection extends StateMachine {
		TelephonyManager.getNetworkTypeName(networkType));
		if (mNetworkAgent != null) {
		updateNetworkInfoSuspendState();
		mNetworkAgent.sendNetworkCapabilities(makeNetworkCapabilities());
		mNetworkAgent.sendNetworkCapabilities(getNetworkCapabilities());
		mNetworkAgent.sendNetworkInfo(mNetworkInfo);
		mNetworkAgent.sendLinkProperties(mLinkProperties);
		}
		@@ -1584,7 +1580,7 @@ public class DataConnection extends StateMachine {
		if (createNetworkAgent) {
		setNetworkRestriction();
		mNetworkAgent = new DcNetworkAgent(getHandler().getLooper(), mPhone.getContext(),
		"DcNetworkAgent", mNetworkInfo, makeNetworkCapabilities(), mLinkProperties,
		"DcNetworkAgent", mNetworkInfo, getNetworkCapabilities(), mLinkProperties,
		50, misc);
		}
		}
		@@ -1706,7 +1702,7 @@ public class DataConnection extends StateMachine {
		} else {
		final ArrayList<Integer> capInfo = (ArrayList<Integer>)ar.result;
		final int lceBwDownKbps = capInfo.get(0);
		NetworkCapabilities nc = makeNetworkCapabilities();
		NetworkCapabilities nc = getNetworkCapabilities();
		if (mPhone.getLceStatus() == RILConstants.LCE_ACTIVE) {
		nc.setLinkDownstreamBandwidthKbps(lceBwDownKbps);
		if (mNetworkAgent != null) {
		@@ -2059,7 +2055,7 @@ public class DataConnection extends StateMachine {
		+ " mLastFailCause=" + mLastFailCause
		+ " mTag=" + mTag
		+ " mLinkProperties=" + mLinkProperties
		+ " linkCapabilities=" + makeNetworkCapabilities()
		+ " linkCapabilities=" + getNetworkCapabilities()
		+ " mRestrictedNetworkOverride=" + mRestrictedNetworkOverride;
		}

		@@ -2109,7 +2105,7 @@ public class DataConnection extends StateMachine {
		pw.flush();
		pw.println(" mDataRegState=" + mDataRegState);
		pw.println(" mRilRat=" + mRilRat);
		pw.println(" mNetworkCapabilities=" + makeNetworkCapabilities());
		pw.println(" mNetworkCapabilities=" + getNetworkCapabilities());
		pw.println(" mCreateTime=" + TimeUtils.logTimeOfDay(mCreateTime));
		pw.println(" mLastFailTime=" + TimeUtils.logTimeOfDay(mLastFailTime));
		pw.println(" mLastFailCause=" + mLastFailCause);

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -16,16 +16,16 @@

		package com.android.internal.telephony.dataconnection;

		import com.android.internal.telephony.dataconnection.DataConnection.ConnectionParams;
		import com.android.internal.telephony.dataconnection.DataConnection.DisconnectParams;
		import com.android.internal.util.AsyncChannel;
		import com.android.internal.util.Protocol;

		import android.net.LinkProperties;
		import android.net.NetworkCapabilities;
		import android.net.ProxyInfo;
		import android.os.Message;

		import com.android.internal.telephony.dataconnection.DataConnection.ConnectionParams;
		import com.android.internal.telephony.dataconnection.DataConnection.DisconnectParams;
		import com.android.internal.util.AsyncChannel;
		import com.android.internal.util.Protocol;

		/**
		* AsyncChannel to a DataConnection
		*/
		@@ -342,7 +342,7 @@ public class DcAsyncChannel extends AsyncChannel {
		value = null;
		}
		} else {
		value = mDc.getCopyNetworkCapabilities();
		value = mDc.getNetworkCapabilities();
		}
		return value;
		}

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DataConnectionTest.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -278,8 +278,8 @@ public class DataConnectionTest extends TelephonyTest {
		return (NetworkInfo) f.get(mDc);
		}

		private NetworkCapabilities getCopyNetworkCapabilities() throws Exception {
		Method method = DataConnection.class.getDeclaredMethod("getCopyNetworkCapabilities");
		private NetworkCapabilities getNetworkCapabilities() throws Exception {
		Method method = DataConnection.class.getDeclaredMethod("getNetworkCapabilities");
		method.setAccessible(true);
		return (NetworkCapabilities) method.invoke(mDc);
		}
		@@ -294,8 +294,8 @@ public class DataConnectionTest extends TelephonyTest {

		testConnectEvent();

		assertFalse(getCopyNetworkCapabilities().
		hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED));
		assertFalse(getNetworkCapabilities()
		.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED));
		assertTrue(getNetworkInfo().isMetered());
		}

		@@ -310,8 +310,8 @@ public class DataConnectionTest extends TelephonyTest {

		testConnectEvent();

		assertTrue(getCopyNetworkCapabilities().
		hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED));
		assertTrue(getNetworkCapabilities()
		.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED));
		assertFalse(getNetworkInfo().isMetered());
		}
		}
		No newline at end of file