PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'Mobile plan' is searchable even if it is unavailable

Browse Source 
'Mobile plan' yields a search hit event though the 'Mobile plan'
setting is unavailable on the device.

Bug: 287198186
Test: Manual
Change-Id: Ibc6f01602a364ae902f8a6ce15083890e89446d2
This commit is contained in:
David Magno
2023-06-14 10:41:52 +02:00
parent 286344d539
commit 50e8eab484
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/MobilePlanPreferenceController.java
View File

@@ -57,7 +57,7 @@ public class MobilePlanPreferenceController extends AbstractPreferenceController
public static final int MANAGE_MOBILE_PLAN_DIALOG_ID = 1; public static final int MANAGE_MOBILE_PLAN_DIALOG_ID = 1;
private static final String TAG = "MobilePlanPrefContr"; 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 static final String SAVED_MANAGE_MOBILE_PLAN_MSG = "mManageMobilePlanMessage";
private final UserManager mUserManager; private final UserManager mUserManager;

12
src/com/android/settings/network/NetworkDashboardFragment.java
View File

@@ -174,5 +174,17 @@ public class NetworkDashboardFragment extends DashboardFragment implements
null /* metricsFeatureProvider */, null /* fragment */, null /* metricsFeatureProvider */, null /* fragment */,
null /* mobilePlanHost */); 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;
}
}; };
} }