Merge "NR SA only allow NR Advanced override" into tm-dev (1a424090) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −9

Original line number	Diff line number	Diff line
		@@ -101,14 +101,6 @@ public class DisplayInfoController extends Handler {
		}
		}

		/**
		* @return True if either the primary or secondary 5G hysteresis timer is active,
		* and false if neither are.
		*/
		public boolean is5GHysteresisActive() {
		return mNetworkTypeController.is5GHysteresisActive();
		}

		/**
		* Validate the display info and trigger anomaly report if needed.
		*
		@@ -136,7 +128,7 @@ public class DisplayInfoController extends Handler {
		}
		} catch (InvalidArgumentException e) {
		logel(e.getMessage());
		AnomalyReporter.reportAnomaly(UUID.fromString("3aa92a2c-94ed-46a0-a744-d6b1dfec2a54"),
		AnomalyReporter.reportAnomaly(UUID.fromString("3aa92a2c-94ed-46a0-a744-d6b1dfec2a55"),
		e.getMessage());
		}
		}

+4 −2

Original line number	Diff line number	Diff line
		@@ -470,8 +470,10 @@ public class NetworkTypeController extends StateMachine {
		}
		// Icon display keys in order of priority
		List<String> keys = new ArrayList<>();
		if (isNrSa && isNrAdvanced()) {
		if (isNrSa) {
		if (isNrAdvanced()) {
		keys.add(STATE_CONNECTED_NR_ADVANCED);
		}
		} else {
		switch (mPhone.getServiceState().getNrState()) {
		case NetworkRegistrationInfo.NR_STATE_CONNECTED: