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

Merge "Index the System status page" into oc-mr1-dev am: 6203bde8d3

Browse Source 
am: 8896df965b

Change-Id: I70141cb7f89794f734a33b2f90e470e1554c3320
This commit is contained in:
Matthew Fritze
2017-09-13 09:47:02 +00:00
committed by android-build-merger
parent be31cd3a79 8896df965b
commit 7448204f36
6 changed files with 135 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/wifi/ConfigureWifiSettings.java
View File

@@ -19,6 +19,8 @@ import static android.content.Context.WIFI_SERVICE;
import android.content.Context;
import android.content.Intent;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.net.NetworkScoreManager;
import android.net.wifi.WifiManager;
import android.provider.SearchIndexableResource;
@@ -42,6 +44,8 @@ public class ConfigureWifiSettings extends DashboardFragment {
private static final String TAG = "ConfigureWifiSettings";
public static final String KEY_IP_ADDRESS = "current_ip_address";
private WifiWakeupPreferenceController mWifiWakeupPreferenceController;
private UseOpenWifiPreferenceController mUseOpenWifiPreferenceController;
@@ -114,5 +118,22 @@ public class ConfigureWifiSettings extends DashboardFragment {
sir.xmlResId = R.xml.wifi_configure_settings;
return Arrays.asList(sir);
}
@Override
public List<String> getNonIndexableKeys(Context context) {
List<String> keys = super.getNonIndexableKeys(context);
// If connected to WiFi, this IP address will be the same as the Status IP.
// Or, if there is no connection they will say unavailable.
ConnectivityManager cm = (ConnectivityManager)
context.getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo info = cm.getActiveNetworkInfo();
if (info == null
|| info.getType() == ConnectivityManager.TYPE_WIFI) {
keys.add(KEY_IP_ADDRESS);
}
return keys;
}
};
}