Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97c1d427 authored Jun 23, 2020 by Sarah Chin Committed by Automerger Merge Worker Jun 23, 2020

Merge "Use cached preferred network type for 5G icon" am: 9c37d93c

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1346531

Change-Id: I2350c9d8b6639a822264de52d3d49ed36dcdff4d

parents 535503ae 9c37d93c

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

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -356,6 +356,11 @@ public class NetworkTypeController extends StateMachine {
	}		}

	private @Annotation.OverrideNetworkType int getNrDisplayType() {		private @Annotation.OverrideNetworkType int getNrDisplayType() {
			// Don't show 5G icon if preferred network type does not include 5G
			if ((mPhone.getCachedPreferredNetworkType() & TelephonyManager.NETWORK_TYPE_BITMASK_NR)
			== 0) {
			return TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE;
			}
	// Icon display keys in order of priority		// Icon display keys in order of priority
	List<String> keys = new ArrayList<>();		List<String> keys = new ArrayList<>();
	// TODO: Update for NR SA		// TODO: Update for NR SA

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

+12 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2193,6 +2193,17 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
	mCi.getPreferredNetworkType(response);		mCi.getPreferredNetworkType(response);
	}		}

			/**
			* Get the cached value of the preferred network type setting
			*/
			public int getCachedPreferredNetworkType() {
			if (mCi != null && mCi instanceof BaseCommands) {
			return ((BaseCommands) mCi).mPreferredNetworkType;
			} else {
			return RILConstants.PREFERRED_NETWORK_MODE;
			}
			}

	/**		/**
	* Gets the default SMSC address.		* Gets the default SMSC address.
	*		*

tests/telephonytests/src/com/android/internal/telephony/NetworkTypeControllerTest.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -88,6 +88,8 @@ public class NetworkTypeControllerTest extends TelephonyTest {
	broadcastCarrierConfigs();		broadcastCarrierConfigs();

	replaceInstance(Handler.class, "mLooper", mDisplayInfoController, Looper.myLooper());		replaceInstance(Handler.class, "mLooper", mDisplayInfoController, Looper.myLooper());
			doReturn((int) TelephonyManager.NETWORK_TYPE_BITMASK_NR).when(mPhone)
			.getCachedPreferredNetworkType();
	mNetworkTypeController = new NetworkTypeController(mPhone, mDisplayInfoController);		mNetworkTypeController = new NetworkTypeController(mPhone, mDisplayInfoController);
	}		}