From b36becff0831e48e208495a2c4ccf1a7330aeb58 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Thu, 8 Jan 2015 11:12:39 -0500 Subject: [PATCH] Avoid showing emergency calls when not possible Tablets aren't phones, so we shouldn't be showing an emergency calls only message when in airplane mode or no sims are in them. Bug: 18897573 Change-Id: I8cf31fe73dfd6dfd672a5ee58524815475a76c9c --- .../src/com/android/systemui/qs/tiles/CellularTile.java | 5 +++++ .../systemui/statusbar/policy/NetworkControllerImpl.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java index f2ebcf6b49440..ddb96a2a1739e 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java @@ -184,6 +184,11 @@ public class CellularTile extends QSTile { // Make sure signal gets cleared out when no sims. mInfo.mobileSignalIconId = 0; mInfo.dataTypeIconId = 0; + // Show a No SIMs description to avoid emergency calls message. + mInfo.enabled = true; + mInfo.enabledDesc = mContext.getString( + R.string.keyguard_missing_sim_message_short); + mInfo.signalContentDescription = mInfo.enabledDesc; } refreshState(mInfo); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java index 5eebf3c4be567..08460f8fe0d91 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java @@ -1192,7 +1192,7 @@ public class NetworkControllerImpl extends BroadcastReceiver int length = mSignalsChangedCallbacks.size(); for (int i = 0; i < length; i++) { mSignalsChangedCallbacks.get(i).onMobileDataSignalChanged(mCurrentState.enabled - && !mCurrentState.isEmergency && !mCurrentState.airplaneMode, + && !mCurrentState.isEmergency, getQsCurrentIconId(), contentDescription, qsTypeIcon, mCurrentState.dataConnected && mCurrentState.activityIn,