Pass the modem count to registerCarrierPrivilegeListeners
This is clearer and less dangerous locking-wise
Test: FrameworksNetTests
Change-Id: Ife09fef848144e74ddb02aba3594913899bc9f46
diff --git a/service/src/com/android/server/connectivity/CarrierPrivilegeAuthenticator.java b/service/src/com/android/server/connectivity/CarrierPrivilegeAuthenticator.java
index 7a001a1..90fc0fa 100644
--- a/service/src/com/android/server/connectivity/CarrierPrivilegeAuthenticator.java
+++ b/service/src/com/android/server/connectivity/CarrierPrivilegeAuthenticator.java
@@ -119,17 +119,13 @@
synchronized (mLock) {
unregisterCarrierPrivilegesListeners();
mModemCount = mTelephonyManager.getActiveModemCount();
- registerCarrierPrivilegesListeners();
+ registerCarrierPrivilegesListeners(mModemCount);
updateCarrierServiceUid();
}
}
- private void registerCarrierPrivilegesListeners() {
+ private void registerCarrierPrivilegesListeners(final int modemCount) {
final HandlerExecutor executor = new HandlerExecutor(mHandler);
- int modemCount;
- synchronized (mLock) {
- modemCount = mModemCount;
- }
try {
for (int i = 0; i < modemCount; i++) {
CarrierPrivilegesListenerShim carrierPrivilegesListener =