aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-11-06 01:49:51 -0800
committerMichael Bestas <mikeioannina@gmail.com>2017-01-07 01:41:43 +0200
commit47fdfe3d06059012839cd07ffa28095b8d2e7237 (patch)
tree2f08553019c1f381df91b2785107f0f741e1d2cc
parent0fff85dc07663a12366b55dda6b724f6d8aa4ce1 (diff)
downloadandroid_frameworks_opt_telephony-47fdfe3d06059012839cd07ffa28095b8d2e7237.tar.gz
android_frameworks_opt_telephony-47fdfe3d06059012839cd07ffa28095b8d2e7237.tar.bz2
android_frameworks_opt_telephony-47fdfe3d06059012839cd07ffa28095b8d2e7237.zip
telephony: Fix NPE when switching data SIM
Change-Id: If30a7d33af56a8d66eb36d516aef6ebe165be83a
-rw-r--r--src/java/com/android/internal/telephony/Phone.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/java/com/android/internal/telephony/Phone.java b/src/java/com/android/internal/telephony/Phone.java
index 8e858ecb1..62383b8e4 100644
--- a/src/java/com/android/internal/telephony/Phone.java
+++ b/src/java/com/android/internal/telephony/Phone.java
@@ -3360,7 +3360,9 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
}
public void unregisterForDataEnabledChanged(Handler h) {
- mDcTracker.unregisterForDataEnabledChanged(h);
+ if (mDcTracker != null) {
+ mDcTracker.unregisterForDataEnabledChanged(h);
+ }
}
public IccSmsInterfaceManager getIccSmsInterfaceManager(){