From 83bc2aafd7563dd12673bbafe6226d4db0c89beb Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Fri, 5 Dec 2014 10:16:24 -0500 Subject: [PATCH] CarrierText clear itself when no mob. data support Bug: 18552426 Change-Id: I48e7d1434861dc99284bb0b58c023c1d749e513a --- .../src/com/android/keyguard/CarrierText.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/packages/Keyguard/src/com/android/keyguard/CarrierText.java b/packages/Keyguard/src/com/android/keyguard/CarrierText.java index 7f4ce5947e186..d8b0c7170a863 100644 --- a/packages/Keyguard/src/com/android/keyguard/CarrierText.java +++ b/packages/Keyguard/src/com/android/keyguard/CarrierText.java @@ -21,6 +21,7 @@ import java.util.Locale; import android.content.Context; import android.content.res.TypedArray; +import android.net.ConnectivityManager; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.text.TextUtils; @@ -140,14 +141,23 @@ public class CarrierText extends TextView { @Override protected void onAttachedToWindow() { super.onAttachedToWindow(); - mKeyguardUpdateMonitor = KeyguardUpdateMonitor.getInstance(mContext); - mKeyguardUpdateMonitor.registerCallback(mCallback); + if (ConnectivityManager.from(mContext).isNetworkSupported( + ConnectivityManager.TYPE_MOBILE)) { + mKeyguardUpdateMonitor = KeyguardUpdateMonitor.getInstance(mContext); + mKeyguardUpdateMonitor.registerCallback(mCallback); + } else { + // Don't listen and clear out the text when the device isn't a phone. + mKeyguardUpdateMonitor = null; + setText(""); + } } @Override protected void onDetachedFromWindow() { super.onDetachedFromWindow(); - mKeyguardUpdateMonitor.removeCallback(mCallback); + if (mKeyguardUpdateMonitor != null) { + mKeyguardUpdateMonitor.removeCallback(mCallback); + } } /**