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

Commit 04e59a1d authored by Nathan Harold's avatar Nathan Harold Committed by Automerger Merge Worker
Browse files

Merge "Fixups for Barring Info" am: 84e81127 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2251745



Change-Id: Ib8980e470197268b188a2d769c466cd798a677ad
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9ac600db 84e81127

services/core/java/com/android/server/TelephonyRegistry.java

+28 −22
Original line number Diff line number Diff line
@@ -2572,14 +2572,21 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
        if (!checkNotifyPermission("notifyBarringInfo()")) {

            return;

        }

        if (barringInfo == null) {

            log("Received null BarringInfo for subId=" + subId + ", phoneId=" + phoneId);

            mBarringInfo.set(phoneId, new BarringInfo());

        if (!validatePhoneId(phoneId)) {

            loge("Received invalid phoneId for BarringInfo = " + phoneId);

            return;

        }



        synchronized (mRecords) {

            if (validatePhoneId(phoneId)) {

            if (barringInfo == null) {

                loge("Received null BarringInfo for subId=" + subId + ", phoneId=" + phoneId);

                mBarringInfo.set(phoneId, new BarringInfo());

                return;

            }

            if (barringInfo.equals(mBarringInfo.get(phoneId))) {

                if (VDBG) log("Ignoring duplicate barring info.");

                return;

            }

            mBarringInfo.set(phoneId, barringInfo);

            // Barring info is non-null

            BarringInfo biNoLocation = barringInfo.createLocationInfoSanitizedCopy();
@@ -2601,7 +2608,6 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                    }

                }

            }

            }

            handleRemoveListLocked();

        }

    }