Merge "Revert "Fixed that locale tracker incorrectly used the invalid cell info"" into pi-dev (fa931b5b) · Commits · e / os / android_frameworks_opt_telephony

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

+7 −6

Original line number	Diff line number	Diff line
		@@ -217,11 +217,13 @@ public class LocaleTracker extends Handler {
		*/
		public synchronized void updateOperatorNumericSync(String operatorNumeric) {
		// Check if the operator numeric changes.
		if (DBG) log("updateOperatorNumericSync. mcc/mnc=" + operatorNumeric);
		if (!Objects.equals(mOperatorNumeric, operatorNumeric)) {
		String msg = "Operator numeric changes to " + operatorNumeric;
		String msg = "updateOperatorNumeric. mcc/mnc=" + operatorNumeric;
		if (DBG) log(msg);
		mLocalLog.log(msg);
		if (!Objects.equals(mOperatorNumeric, operatorNumeric)) {
		if (DBG) {
		log("onUpdateOperatorNumeric: operator numeric changes to " + operatorNumeric);
		}
		mOperatorNumeric = operatorNumeric;

		// If the operator numeric becomes unavailable, we need to get the latest cell info so
		@@ -277,8 +279,7 @@ public class LocaleTracker extends Handler {
		private void getCellInfo() {
		String msg;
		if (!mPhone.getServiceStateTracker().getDesiredPowerState()) {
		msg = "Radio is off. Skipped getting cell info. Cleared the previous cached cell info.";
		mCellInfo.clear();
		msg = "Radio is off. No need to get cell info.";
		if (DBG) log(msg);
		mLocalLog.log(msg);
		return;