summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2012-05-02 14:12:35 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-05-02 14:12:36 -0700
commitb3c17c570a6c26ece11b404a5918ce4bd64a0940 (patch)
treed6f4d45c44725d4890b83d63814e1f4155d2759f
parent299ed15213796bbcb953db12479b74a7c024e2c6 (diff)
parent41e70e67fa218858a38a4105b3fbadcd4f82c846 (diff)
downloadpackages_apps_Settings-b3c17c570a6c26ece11b404a5918ce4bd64a0940.tar.gz
packages_apps_Settings-b3c17c570a6c26ece11b404a5918ce4bd64a0940.tar.bz2
packages_apps_Settings-b3c17c570a6c26ece11b404a5918ce4bd64a0940.zip
Merge "Removing static reference from sUnknown"
-rw-r--r--src/com/android/settings/deviceinfo/Status.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index c315acdeb..434dfe788 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -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...