Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev

src/com/android/settings/network/telephony/AbstractSubscriptionPreferenceController.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import android.content.Context;
+
+/**
+ * {@link TelephonyBasePreferenceController} used to add vendor preference controllers in {@link
+ * MobileNetworkSettings}.
+ */
+public abstract class AbstractSubscriptionPreferenceController
+        extends TelephonyBasePreferenceController {
+    public AbstractSubscriptionPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    public void init(int subId) {
+        mSubId = subId;
+    }
+}

src/com/android/settings/network/telephony/MobileNetworkSettings.java

@@ -300,6 +300,13 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings impleme
         if (convertToEsimPreferenceController != null) {
             convertToEsimPreferenceController.init(mSubId, mSubscriptionInfoEntity);
         }
+
+        List<AbstractSubscriptionPreferenceController> subscriptionPreferenceControllers =
+                useAll(AbstractSubscriptionPreferenceController.class);
+        for (AbstractSubscriptionPreferenceController controller :
+                subscriptionPreferenceControllers) {
+            controller.init(mSubId);
+        }
     }
 
     @Override