Merge "CPT: Fix a missing break statement" into tm-dev (b88dbe0c) · Commits · e / os / android_frameworks_opt_telephony

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

+6 −3

Original line number	Diff line number	Diff line
		@@ -31,6 +31,8 @@ import static android.telephony.TelephonyManager.SIM_STATE_NOT_READY;
		import static android.telephony.TelephonyManager.SIM_STATE_READY;
		import static android.telephony.TelephonyManager.SIM_STATE_UNKNOWN;

		import static com.android.internal.telephony.SubscriptionInfoUpdater.simStateString;

		import android.annotation.ElapsedRealtimeLong;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		@@ -440,6 +442,7 @@ public class CarrierPrivilegesTracker extends Handler {
		}
		case ACTION_UICC_ACCESS_RULES_LOADED: {
		handleUiccAccessRulesLoaded();
		break;
		}
		default: {
		Rlog.e(TAG, "Received unknown msg type: " + msg.what);
		@@ -522,9 +525,9 @@ public class CarrierPrivilegesTracker extends Handler {
		SystemClock.uptimeMillis() + CLEAR_UICC_RULES_DELAY_MILLIS;
		sendMessageAtTime(obtainMessage(ACTION_CLEAR_UICC_RULES),
		mClearUiccRulesUptimeMillis);
		mLocalLog.log("SIM is gone, simState=" + simState + ". Delay "
		+ TimeUnit.MILLISECONDS.toSeconds(CLEAR_UICC_RULES_DELAY_MILLIS)
		+ " seconds to clear UICC rules.");
		mLocalLog.log("SIM is gone, simState=" + simStateString(simState)
		+ ". Delay " + TimeUnit.MILLISECONDS.toSeconds(
		CLEAR_UICC_RULES_DELAY_MILLIS) + " seconds to clear UICC rules.");
		} else {
		mLocalLog.log(
		"Ignore SIM gone event while UiccRules is empty or waiting to be emptied.");