Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixups for Barring Info" am: 84e81127b0

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

Change-Id: Ib8980e470197268b188a2d769c466cd798a677ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nathan Harold
2022-10-20 17:52:27 +00:00
committed by Automerger Merge Worker
parent 9ac600db5a 84e81127b0
commit 04e59a1d10
1 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
services/core/java/com/android/server/TelephonyRegistry.java
View File

@@ -2572,33 +2572,39 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
if (!checkNotifyPermission("notifyBarringInfo()")) { if (!checkNotifyPermission("notifyBarringInfo()")) {
return; return;
} }
if (barringInfo == null) { if (!validatePhoneId(phoneId)) {
log("Received null BarringInfo for subId=" + subId + ", phoneId=" + phoneId); loge("Received invalid phoneId for BarringInfo = " + phoneId);
mBarringInfo.set(phoneId, new BarringInfo());
return; return;
} }
synchronized (mRecords) { synchronized (mRecords) {
if (validatePhoneId(phoneId)) { if (barringInfo == null) {
mBarringInfo.set(phoneId, barringInfo); loge("Received null BarringInfo for subId=" + subId + ", phoneId=" + phoneId);
// Barring info is non-null mBarringInfo.set(phoneId, new BarringInfo());
BarringInfo biNoLocation = barringInfo.createLocationInfoSanitizedCopy(); return;
if (VDBG) log("listen: call onBarringInfoChanged=" + barringInfo); }
for (Record r : mRecords) { if (barringInfo.equals(mBarringInfo.get(phoneId))) {
if (r.matchTelephonyCallbackEvent( if (VDBG) log("Ignoring duplicate barring info.");
TelephonyCallback.EVENT_BARRING_INFO_CHANGED) return;
&& idMatch(r, subId, phoneId)) { }
try { mBarringInfo.set(phoneId, barringInfo);
if (DBG_LOC) { // Barring info is non-null
log("notifyBarringInfo: mBarringInfo=" BarringInfo biNoLocation = barringInfo.createLocationInfoSanitizedCopy();
+ barringInfo + " r=" + r); if (VDBG) log("listen: call onBarringInfoChanged=" + barringInfo);
} for (Record r : mRecords) {
r.callback.onBarringInfoChanged( if (r.matchTelephonyCallbackEvent(
checkFineLocationAccess(r, Build.VERSION_CODES.BASE) TelephonyCallback.EVENT_BARRING_INFO_CHANGED)
? barringInfo : biNoLocation); && idMatch(r, subId, phoneId)) {
} catch (RemoteException ex) { try {
mRemoveList.add(r.binder); if (DBG_LOC) {
log("notifyBarringInfo: mBarringInfo="
+ barringInfo + " r=" + r);
} }
r.callback.onBarringInfoChanged(
checkFineLocationAccess(r, Build.VERSION_CODES.BASE)
? barringInfo : biNoLocation);
} catch (RemoteException ex) {
mRemoveList.add(r.binder);
} }
} }
} }