commit b3c17c570a6c26ece11b404a5918ce4bd64a0940
author Amith Yamasani <yamasani@google.com> Wed May 02 14:12:35 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Wed May 02 14:12:36 2012 -0700
tree d6f4d45c44725d4890b83d63814e1f4155d2759f
parent 299ed15213796bbcb953db12479b74a7c024e2c6
parent 41e70e67fa218858a38a4105b3fbadcd4f82c846

Merge "Removing static reference from sUnknown"

src/com/android/settings/deviceinfo/Status.java

diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index c315acd..434dfe7 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -115,7 +115,7 @@
     private Preference mSignalStrength;
     private Preference mUptime;
 
-    private static String sUnknown;
+    private String sUnknown;
 
     private Preference mBatteryStatus;
     private Preference mBatteryLevel;
@@ -188,9 +188,7 @@
         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...