Merge "Synchronize onMultiSimConfigChanged with callback registrations." into tm-dev (5d6650dd) · Commits · e / os / android_frameworks_base

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

+101 −97

Original line number	Diff line number	Diff line
		@@ -651,6 +651,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		}

		private void onMultiSimConfigChanged() {
		synchronized (mRecords) {
		int oldNumPhones = mNumPhones;
		mNumPhones = getTelephonyManager().getActiveModemCount();
		if (oldNumPhones == mNumPhones) return;
		@@ -747,6 +748,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		mCarrierPrivilegeStates.add(i, new Pair<>(Collections.emptyList(), new int[0]));
		}
		}
		}

		private void cutListToSize(List list, int size) {
		if (list == null) return;
		@@ -2802,11 +2804,11 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		+ " callback=" + callback
		+ " callback.asBinder=" + callback.asBinder());
		}

		synchronized (mRecords) {
		if (!validatePhoneId(phoneId)) {
		throw new IllegalArgumentException("Invalid slot index: " + phoneId);
		}

		synchronized (mRecords) {
		Record r = add(
		callback.asBinder(), Binder.getCallingUid(), Binder.getCallingPid(), false);

		@@ -2851,7 +2853,6 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		if (!checkNotifyPermission("notifyCarrierPrivilegesChanged")) {
		return;
		}
		if (!validatePhoneId(phoneId)) return;
		if (VDBG) {
		log(
		"notifyCarrierPrivilegesChanged: phoneId=" + phoneId
		@@ -2859,6 +2860,9 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		+ ", uids=" + Arrays.toString(privilegedUids) + ">");
		}
		synchronized (mRecords) {
		if (!validatePhoneId(phoneId)) {
		throw new IllegalArgumentException("Invalid slot index: " + phoneId);
		}
		mCarrierPrivilegeStates.set(
		phoneId, new Pair<>(privilegedPackageNames, privilegedUids));
		for (Record r : mRecords) {