commit a3f9f42b71f85cbe8321f0ebc72b916b579bb503
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Jun 15 08:57:32 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 15 08:57:32 2023 +0000
tree 9540499cef84c8d19c31802cdf9e8839b75f154b
parent 286344d539e8535c8ddfe40808afbee70893f39e
parent 50e8eab484425b059e7808c6bd6ca32cc08562a3

Merge "'Mobile plan' is searchable even if it is unavailable"

src/com/android/settings/network/MobilePlanPreferenceController.java

diff --git a/src/com/android/settings/network/MobilePlanPreferenceController.java b/src/com/android/settings/network/MobilePlanPreferenceController.java
index d8963ad..fcca5e6 100644
--- a/src/com/android/settings/network/MobilePlanPreferenceController.java
+++ b/src/com/android/settings/network/MobilePlanPreferenceController.java
@@ -57,7 +57,7 @@
     public static final int MANAGE_MOBILE_PLAN_DIALOG_ID = 1;
 
     private static final String TAG = "MobilePlanPrefContr";
-    private static final String KEY_MANAGE_MOBILE_PLAN = "manage_mobile_plan";
+    static final String KEY_MANAGE_MOBILE_PLAN = "manage_mobile_plan";
     private static final String SAVED_MANAGE_MOBILE_PLAN_MSG = "mManageMobilePlanMessage";
 
     private final UserManager mUserManager;

src/com/android/settings/network/NetworkDashboardFragment.java

diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java
index 0cd24dc..eaedae6 100644
--- a/src/com/android/settings/network/NetworkDashboardFragment.java
+++ b/src/com/android/settings/network/NetworkDashboardFragment.java
@@ -174,5 +174,17 @@
                             null /* metricsFeatureProvider */, null /* fragment */,
                             null /* mobilePlanHost */);
                 }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    final List<String> keys = super.getNonIndexableKeys(context);
+
+                    MobilePlanPreferenceController mppc =
+                            new MobilePlanPreferenceController(context, null);
+                    if (!mppc.isAvailable()) {
+                        keys.add(MobilePlanPreferenceController.KEY_MANAGE_MOBILE_PLAN);
+                    }
+                    return keys;
+                }
             };
 }