Merge "Add carrier settings version to network details page"

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

@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2019 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;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+
+import com.android.settings.core.BasePreferenceController;
+
+public class CarrierSettingsVersionPreferenceController extends BasePreferenceController {
+
+    private int mSubscriptionId;
+    private CarrierConfigManager mManager;
+
+    public CarrierSettingsVersionPreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+        mManager = context.getSystemService(CarrierConfigManager.class);
+        mSubscriptionId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+    }
+
+    public void init(int subscriptionId) {
+        mSubscriptionId = subscriptionId;
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        final PersistableBundle config = mManager.getConfigForSubId(mSubscriptionId);
+        if (config == null) {
+            return null;
+        }
+        return config.getString(CarrierConfigManager.KEY_CARRIER_CONFIG_VERSION_STRING);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+}

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

@@ -133,6 +133,7 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment {
           use(CallsDefaultSubscriptionController.class).init(getLifecycle());
           use(SmsDefaultSubscriptionController.class).init(getLifecycle());
           use(MobileNetworkSwitchController.class).init(getLifecycle(), mSubId);
+          use(CarrierSettingsVersionPreferenceController.class).init(mSubId);
         }
         use(MobileDataPreferenceController.class).init(getFragmentManager(), mSubId);
         use(RoamingPreferenceController.class).init(getFragmentManager(), mSubId);