commit 6af0b8714d1d1ca998c8c63163069693c470dfb3
author Chalard Jean <jchalard@google.com> Mon Jan 30 12:42:51 2023 +0900
committer Chalard Jean <jchalard@google.com> Thu Sep 28 21:37:32 2023 +0900
tree dd2b5bf700ad442c82d4bd193b4c60379fb8cb1c
parent 9a685267c2c17e9f6cdb19eafcc5d16fc9ede36c

Inline registerForCarrierChanges

This method is only called once in system ready and is better
inlined. This will also make followups clearer where they
start using callbacks to listen to service package updates
based on a flag.

Test: CarrierPrivilegeAuthenticatorTest
Change-Id: I39cab8ff1c71a8ba0db6d189d8a248013764b18e

service/src/com/android/server/connectivity/CarrierPrivilegeAuthenticator.java

diff --git a/service/src/com/android/server/connectivity/CarrierPrivilegeAuthenticator.java b/service/src/com/android/server/connectivity/CarrierPrivilegeAuthenticator.java
index a3b5cdc..d7e6192 100644
--- a/service/src/com/android/server/connectivity/CarrierPrivilegeAuthenticator.java
+++ b/service/src/com/android/server/connectivity/CarrierPrivilegeAuthenticator.java
@@ -72,6 +72,7 @@
     private final Object mLock = new Object();
     private final Handler mHandler;
     @NonNull
+    @GuardedBy("mLock")
     private final List<CarrierPrivilegesListenerShim> mCarrierPrivilegesChangedListeners =
             new ArrayList<>();
     private final boolean mUseCallbacksForServiceChanged;
@@ -88,10 +89,11 @@
         mHandler = new Handler(thread.getLooper());
         mUseCallbacksForServiceChanged = deps.isFeatureEnabled(
                 c, CARRIER_SERVICE_CHANGED_USE_CALLBACK);
+        final IntentFilter filter = new IntentFilter();
+        filter.addAction(TelephonyManager.ACTION_MULTI_SIM_CONFIG_CHANGED);
         synchronized (mLock) {
-            mModemCount = mTelephonyManager.getActiveModemCount();
-            registerForCarrierChanges();
-            updateCarrierServiceUid();
+            c.registerReceiver(this, filter, null, mHandler);
+            simConfigChanged();
         }
     }
 
@@ -110,27 +112,20 @@
     public void onReceive(Context context, Intent intent) {
         switch (intent.getAction()) {
             case TelephonyManager.ACTION_MULTI_SIM_CONFIG_CHANGED:
-                handleActionMultiSimConfigChanged(context, intent);
+                simConfigChanged();
                 break;
             default:
                 Log.d(TAG, "Unknown intent received with action: " + intent.getAction());
         }
     }
 
-    private void handleActionMultiSimConfigChanged(Context context, Intent intent) {
-        unregisterCarrierPrivilegesListeners();
+    private void simConfigChanged() {
         synchronized (mLock) {
+            unregisterCarrierPrivilegesListeners();
             mModemCount = mTelephonyManager.getActiveModemCount();
+            registerCarrierPrivilegesListeners();
+            updateCarrierServiceUid();
         }
-        registerCarrierPrivilegesListeners();
-        updateCarrierServiceUid();
-    }
-
-    private void registerForCarrierChanges() {
-        final IntentFilter filter = new IntentFilter();
-        filter.addAction(TelephonyManager.ACTION_MULTI_SIM_CONFIG_CHANGED);
-        mContext.registerReceiver(this, filter, null, mHandler);
-        registerCarrierPrivilegesListeners();
     }
 
     private void registerCarrierPrivilegesListeners() {