1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java
index a0ccf20db1..a28a726469 100644
--- a/src/com/android/settings/network/NetworkDashboardFragment.java
+++ b/src/com/android/settings/network/NetworkDashboardFragment.java
@@ -142,5 +142,13 @@ public class NetworkDashboardFragment extends DashboardFragment implements
                     sir.xmlResId = R.xml.network_and_internet;
                     return Arrays.asList(sir);
                 }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    List<String> keys = new ArrayList<>();
+                    // Remove master switch as a result
+                    keys.add(WifiMasterSwitchPreferenceController.KEY_TOGGLE_WIFI);
+                    return keys;
+                }
             };
 }