diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-05-02 17:22:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-02 17:22:40 -0700 |
| commit | 404e3a75922668b3d7709f5a5e23d611101c88d1 (patch) | |
| tree | 76613c9922ede689373d6b2fd16837532a8954da /src/com/android/settings/deviceinfo | |
| parent | 946f34d189d8d927f6d571da215e27ac4f59b046 (diff) | |
| parent | b3c17c570a6c26ece11b404a5918ce4bd64a0940 (diff) | |
| download | packages_apps_settings-404e3a75922668b3d7709f5a5e23d611101c88d1.zip packages_apps_settings-404e3a75922668b3d7709f5a5e23d611101c88d1.tar.gz packages_apps_settings-404e3a75922668b3d7709f5a5e23d611101c88d1.tar.bz2 | |
am b3c17c57: Merge "Removing static reference from sUnknown"
* commit 'b3c17c570a6c26ece11b404a5918ce4bd64a0940':
Removing static reference from sUnknown
Diffstat (limited to 'src/com/android/settings/deviceinfo')
| -rw-r--r-- | src/com/android/settings/deviceinfo/Status.java | 6 |
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 1d1dfaa..d4fea37 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... |