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

am 38d3353e: am 03e90322: Merge "Remove more entries not relevant to wifi-only devices." into honeycomb

Browse Source 
* commit '38d3353e37be450b1b95d2525acbd53e9b67130e':
  Remove more entries not relevant to wifi-only devices.
This commit is contained in:
Amith Yamasani
2011-03-02 12:53:31 -08:00
committed by Android Git Automerger
parent 302b057207 38d3353e37
commit 0c62c6449b
8 changed files with 163 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/wifi/AdvancedSettings.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.wifi;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import android.app.Activity;
import android.content.Context;
@@ -103,16 +104,7 @@ public class AdvancedSettings extends SettingsPreferenceFragment
: getActivity().getString(R.string.status_unavailable));
Preference wifiIpAddressPref = findPreference(KEY_CURRENT_IP_ADDRESS);
String ipAddress = null;
if (wifiInfo != null) {
long addr = wifiInfo.getIpAddress();
if (addr != 0) {
// handle negative values whe first octet > 127
if (addr < 0) addr += 0x100000000L;
ipAddress = String.format("%d.%d.%d.%d",
addr & 0xFF, (addr >> 8) & 0xFF, (addr >> 16) & 0xFF, (addr >> 24) & 0xFF);
}
}
String ipAddress = Utils.getWifiIpAddresses(getActivity());
wifiIpAddressPref.setSummary(ipAddress == null ?
getActivity().getString(R.string.status_unavailable) : ipAddress);
}