Merge "Removing static reference from sUnknown"

This commit is contained in:
Amith Yamasani
2012-05-02 14:12:35 -07:00
committed by android code review

View File

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