am b3c17c57: Merge "Removing static reference from sUnknown"

* commit 'b3c17c570a6c26ece11b404a5918ce4bd64a0940':
  Removing static reference from sUnknown
This commit is contained in:
Amith Yamasani
2012-05-02 17:22:40 -07:00
committed by Android Git Automerger

View File

@@ -115,7 +115,7 @@ public class Status extends PreferenceActivity {
private Preference mSignalStrength;
private Preference mUptime;
private static String sUnknown;
private String sUnknown;
private Preference mBatteryStatus;
private Preference mBatteryLevel;
@@ -188,9 +188,7 @@ public class Status extends PreferenceActivity {
mBatteryStatus = findPreference(KEY_BATTERY_STATUS);
mRes = getResources();
if (sUnknown == null) {
sUnknown = mRes.getString(R.string.device_info_default);
}
sUnknown = mRes.getString(R.string.device_info_default);
mPhone = PhoneFactory.getDefaultPhone();
// Note - missing in zaku build, be careful later...