diff options
author | Dan Morrill <morrildl@google.com> | 2011-06-11 09:52:50 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-11 09:52:50 -0700 |
commit | 653fd9cfacd15ddf9c482c46619ca9323da57726 (patch) | |
tree | 2e3f4551705457926162b754ab9c5c3ace8716d6 /packages | |
parent | c2e1e32908e7d3065436c33baa678c9ce478bfa0 (diff) | |
parent | 8688d4708117db446d6ba2855f1d8ad715bb4d72 (diff) | |
download | frameworks_base-653fd9cfacd15ddf9c482c46619ca9323da57726.zip frameworks_base-653fd9cfacd15ddf9c482c46619ca9323da57726.tar.gz frameworks_base-653fd9cfacd15ddf9c482c46619ca9323da57726.tar.bz2 |
am 8688d470: Moving flag to a member field instead of a stack variable.
* commit '8688d4708117db446d6ba2855f1d8ad715bb4d72':
Moving flag to a member field instead of a stack variable.
Diffstat (limited to 'packages')
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java index a9300f3..b30a043 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java @@ -468,6 +468,9 @@ public class StatusBarPolicy { ServiceState mServiceState; SignalStrength mSignalStrength; + // flag for signal strength behavior + private boolean mAlwaysUseCdmaRssi; + // data connection private boolean mDataIconVisible; private boolean mHspaDataDistinguishable; @@ -600,6 +603,8 @@ public class StatusBarPolicy { mPhone = (TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE); mPhoneSignalIconId = R.drawable.stat_sys_signal_null; mService.setIcon("phone_signal", mPhoneSignalIconId, 0); + mAlwaysUseCdmaRssi = mContext.getResources().getBoolean( + com.android.internal.R.bool.config_alwaysUseCdmaRssi); // register for phone state notifications. ((TelephonyManager)mContext.getSystemService(Context.TELEPHONY_SERVICE)) @@ -1075,13 +1080,11 @@ public class StatusBarPolicy { } else { iconList = sSignalImages[mInetCondition]; - boolean alwaysUseCdmaRssi = mContext.getResources().getBoolean( - com.android.internal.R.bool.config_alwaysUseCdmaRssi); // If 3G(EV) and 1x network are available than 3G should be // displayed, displayed RSSI should be from the EV side. // If a voice call is made then RSSI should switch to 1x. if ((mPhoneState == TelephonyManager.CALL_STATE_IDLE) && isEvdo() - && !alwaysUseCdmaRssi) { + && !mAlwaysUseCdmaRssi) { iconLevel = getEvdoLevel(); if (false) { Slog.d(TAG, "use Evdo level=" + iconLevel + " to replace Cdma Level=" + getCdmaLevel()); |