Snap for 5354487 from 9cc0f7743c1af63b317b23f756e022c7160c0b65 to qt-release (8c354b46) · Commits · e / os / android_frameworks_opt_telephony

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

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -71,7 +71,7 @@ public class CellularNetworkService extends NetworkService {
	CellularNetworkServiceProvider(int slotId) {		CellularNetworkServiceProvider(int slotId) {
	super(slotId);		super(slotId);

	mPhone = PhoneFactory.getPhone(getSlotId());		mPhone = PhoneFactory.getPhone(getSlotIndex());

	mHandlerThread = new HandlerThread(CellularNetworkService.class.getSimpleName());		mHandlerThread = new HandlerThread(CellularNetworkService.class.getSimpleName());
	mHandlerThread.start();		mHandlerThread.start();
	@@ -488,13 +488,13 @@ public class CellularNetworkService extends NetworkService {
	}		}

	@Override		@Override
	protected NetworkServiceProvider createNetworkServiceProvider(int slotId) {		public NetworkServiceProvider onCreateNetworkServiceProvider(int slotIndex) {
	if (DBG) log("Cellular network service created for slot " + slotId);		if (DBG) log("Cellular network service created for slot " + slotIndex);
	if (!SubscriptionManager.isValidSlotIndex(slotId)) {		if (!SubscriptionManager.isValidSlotIndex(slotIndex)) {
	loge("Tried to Cellular network service with invalid slotId " + slotId);		loge("Tried to Cellular network service with invalid slotId " + slotIndex);
	return null;		return null;
	}		}
	return new CellularNetworkServiceProvider(slotId);		return new CellularNetworkServiceProvider(slotIndex);
	}		}

	private void log(String s) {		private void log(String s) {

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

+14 −4

Original line number	Original line	Diff line number	Diff line
	@@ -85,6 +85,7 @@ import android.telephony.ServiceState;
	import android.telephony.SmsManager;		import android.telephony.SmsManager;
	import android.telephony.TelephonyHistogram;		import android.telephony.TelephonyHistogram;
	import android.telephony.TelephonyManager;		import android.telephony.TelephonyManager;
			import android.telephony.TelephonyManager.PrefNetworkMode;
	import android.telephony.data.ApnSetting;		import android.telephony.data.ApnSetting;
	import android.telephony.data.DataCallResponse;		import android.telephony.data.DataCallResponse;
	import android.telephony.data.DataProfile;		import android.telephony.data.DataProfile;
	@@ -1494,7 +1495,8 @@ public class RIL extends BaseCommands implements CommandsInterface {

	if (RILJ_LOGD) {		if (RILJ_LOGD) {
	riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)		riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
	+ ",accessNetworkType=" + accessNetworkType + ",isRoaming="		+ ",accessNetworkType="
			+ AccessNetworkType.toString(accessNetworkType) + ",isRoaming="
	+ isRoaming + ",allowRoaming=" + allowRoaming + "," + dataProfile		+ isRoaming + ",allowRoaming=" + allowRoaming + "," + dataProfile
	+ ",addresses=" + addresses + ",dnses=" + dnses);		+ ",addresses=" + addresses + ",dnses=" + dnses);
	}		}
	@@ -1512,7 +1514,8 @@ public class RIL extends BaseCommands implements CommandsInterface {

	if (RILJ_LOGD) {		if (RILJ_LOGD) {
	riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)		riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
	+ ",accessNetworkType=" + accessNetworkType + ",isRoaming="		+ ",accessNetworkType="
			+ AccessNetworkType.toString(accessNetworkType) + ",isRoaming="
	+ isRoaming + ",allowRoaming=" + allowRoaming + ","		+ isRoaming + ",allowRoaming=" + allowRoaming + ","
	+ dataProfile + ",addresses=" + addresses + ",dnses=" + dnses);		+ dataProfile + ",addresses=" + addresses + ",dnses=" + dnses);
	}		}
	@@ -2574,7 +2577,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
	}		}

	@Override		@Override
	public void setPreferredNetworkType(int networkType , Message result) {		public void setPreferredNetworkType(@PrefNetworkMode int networkType , Message result) {
	IRadio radioProxy = getRadioProxy(result);		IRadio radioProxy = getRadioProxy(result);
	if (radioProxy != null) {		if (radioProxy != null) {
	RILRequest rr = obtainRequest(RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE, result,		RILRequest rr = obtainRequest(RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE, result,
	@@ -2598,7 +2601,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
	(android.hardware.radio.V1_4.IRadio) radioProxy;		(android.hardware.radio.V1_4.IRadio) radioProxy;
	try {		try {
	radioProxy14.setPreferredNetworkTypeBitmap(		radioProxy14.setPreferredNetworkTypeBitmap(
	rr.mSerial, RadioAccessFamily.getRafFromNetworkType(networkType));		rr.mSerial, convertToHalRadioAccessFamily(networkType));
	} catch (RemoteException \| RuntimeException e) {		} catch (RemoteException \| RuntimeException e) {
	handleRadioProxyExceptionForRR(rr, "setPreferredNetworkTypeBitmap", e);		handleRadioProxyExceptionForRR(rr, "setPreferredNetworkTypeBitmap", e);
	}		}
	@@ -2606,6 +2609,13 @@ public class RIL extends BaseCommands implements CommandsInterface {
	}		}
	}		}

			private static int convertToHalRadioAccessFamily(@PrefNetworkMode int networkMode) {
			// android.hardware.radio.V1_0.RadioAccessFamily is one bit shift
			// from TelephonyManager.NetworkTypeBitMask
			int networkTypeBitmask = RadioAccessFamily.getRafFromNetworkType(networkMode);
			return networkTypeBitmask << 1;
			}

	@Override		@Override
	public void getPreferredNetworkType(Message result) {		public void getPreferredNetworkType(Message result) {
	IRadio radioProxy = getRadioProxy(result);		IRadio radioProxy = getRadioProxy(result);

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

+193 −83

File changed.

Preview size limit exceeded, changes collapsed.

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

+5 −2

File changed.

Preview size limit exceeded, changes collapsed.

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

+14 −14

File changed.

Preview size limit exceeded, changes collapsed.