Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8688d470: Moving flag to a member field instead of a stack variable.

Browse Source 
* commit '8688d4708117db446d6ba2855f1d8ad715bb4d72':
  Moving flag to a member field instead of a stack variable.
This commit is contained in:
Dan Morrill
2011-06-11 09:52:50 -07:00
committed by Android Git Automerger
parent c2e1e32908 8688d47081
commit 653fd9cfac
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java
View File

@@ -468,6 +468,9 @@ public class StatusBarPolicy {
ServiceState mServiceState; ServiceState mServiceState;
SignalStrength mSignalStrength; SignalStrength mSignalStrength;
// flag for signal strength behavior
private boolean mAlwaysUseCdmaRssi;
// data connection // data connection
private boolean mDataIconVisible; private boolean mDataIconVisible;
private boolean mHspaDataDistinguishable; private boolean mHspaDataDistinguishable;
@@ -600,6 +603,8 @@ public class StatusBarPolicy {
mPhone = (TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE); mPhone = (TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE);
mPhoneSignalIconId = R.drawable.stat_sys_signal_null; mPhoneSignalIconId = R.drawable.stat_sys_signal_null;
mService.setIcon("phone_signal", mPhoneSignalIconId, 0); mService.setIcon("phone_signal", mPhoneSignalIconId, 0);
mAlwaysUseCdmaRssi = mContext.getResources().getBoolean(
com.android.internal.R.bool.config_alwaysUseCdmaRssi);
// register for phone state notifications. // register for phone state notifications.
((TelephonyManager)mContext.getSystemService(Context.TELEPHONY_SERVICE)) ((TelephonyManager)mContext.getSystemService(Context.TELEPHONY_SERVICE))
@@ -1075,13 +1080,11 @@ public class StatusBarPolicy {
} else { } else {
iconList = sSignalImages[mInetCondition]; 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 // If 3G(EV) and 1x network are available than 3G should be
// displayed, displayed RSSI should be from the EV side. // displayed, displayed RSSI should be from the EV side.
// If a voice call is made then RSSI should switch to 1x. // If a voice call is made then RSSI should switch to 1x.
if ((mPhoneState == TelephonyManager.CALL_STATE_IDLE) && isEvdo() if ((mPhoneState == TelephonyManager.CALL_STATE_IDLE) && isEvdo()
&& !alwaysUseCdmaRssi) { && !mAlwaysUseCdmaRssi) {
iconLevel = getEvdoLevel(); iconLevel = getEvdoLevel();
if (false) { if (false) {
Slog.d(TAG, "use Evdo level=" + iconLevel + " to replace Cdma Level=" + getCdmaLevel()); Slog.d(TAG, "use Evdo level=" + iconLevel + " to replace Cdma Level=" + getCdmaLevel());