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

Commit 95bf9000 authored by Ling Ma's avatar Ling Ma
Browse files

Clear OperatorNameStringPattern 

When carrier config changes, clear the operator pattern to null to allow the current operator to be shown correctly.

Fix: 394854134
Test: reporter verified
Test: basic voice call + data browsing
Flag: EXEMPT bugfix
Change-Id: I3fa15db82f8db543aea99a5bf0112f4aa30b8c0c
parent e1db9bd7

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

+4 −2
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ public class ServiceStateTracker extends Handler { 
    private final LocalLog mRadioPowerLog = new LocalLog(16);

    private final LocalLog mCdnrLogs = new LocalLog(64);



    private Pattern mOperatorNameStringPattern;

    @Nullable private Pattern mOperatorNameStringPattern;

    private PersistableBundle mCarrierConfig;



    @NonNull
@@ -5842,8 +5842,10 @@ public class ServiceStateTracker extends Handler { 
        if (!TextUtils.isEmpty(operatorNamePattern)) {

            mOperatorNameStringPattern = Pattern.compile(operatorNamePattern);

            if (DBG) {

                log("mOperatorNameStringPattern: " + mOperatorNameStringPattern.toString());

                log("mOperatorNameStringPattern: " + mOperatorNameStringPattern);

            }

        } else {

            mOperatorNameStringPattern = null;

        }

    }