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

Commit 90c04c28 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "CPT: Fix a missing break statement" into tm-dev am: b88dbe0c 

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



Change-Id: Ib12ff7f3ec33a36a9312c0c116f03bac1b39a4ae
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 12345f9a b88dbe0c

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.");