From bc92613cf79a28d46e47386a202f9f851c237263 Mon Sep 17 00:00:00 2001 From: Kazuhiro Ondo Date: Fri, 27 Jan 2012 08:57:26 -0600 Subject: Display roaming indicator icon only based on ERI in CDMA case. Fixing CV failure. In some scenario where ERI table expects "Roaming Indicator OFF", R icon was still displayed on the status bar. This patch is to update the logic so that only ERI table is used to display R icon in case of CDMA. Bug:5932154 Change-Id: I125087cc8d700b102e05c3050d88a70485c9a86e --- .../systemui/statusbar/policy/NetworkController.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java index d0f72a4..d787e10 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java @@ -588,8 +588,12 @@ public class NetworkController extends BroadcastReceiver { } } - if ((isCdma() && isCdmaEri()) || mPhone.isNetworkRoaming()) { - mDataTypeIconId = R.drawable.stat_sys_data_connected_roam; + if (isCdma()) { + if (isCdmaEri()) { + mDataTypeIconId = R.drawable.stat_sys_data_connected_roam; + } + } else if (mPhone.isNetworkRoaming()) { + mDataTypeIconId = R.drawable.stat_sys_data_connected_roam; } } @@ -1019,10 +1023,13 @@ public class NetworkController extends BroadcastReceiver { mContentDescriptionCombinedSignal = mHasMobileDataFeature ? mContentDescriptionDataType : mContentDescriptionWifi; - if ((isCdma() && isCdmaEri()) || mPhone.isNetworkRoaming()) { + mDataTypeIconId = 0; + if (isCdma()) { + if (isCdmaEri()) { + mDataTypeIconId = R.drawable.stat_sys_data_connected_roam; + } + } else if (mPhone.isNetworkRoaming()) { mDataTypeIconId = R.drawable.stat_sys_data_connected_roam; - } else { - mDataTypeIconId = 0; } } -- cgit v1.1