Merge "Fixups for Barring Info" (84e81127) · Commits · e / os / android_frameworks_base

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();
		}
		}