commit 7f4e6e1076faa76618196d06e665f3717b38e713
author Ta-wei Yen <twyen@google.com> Thu Apr 27 19:48:35 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 27 19:48:36 2017 +0000
tree d2dec2b005452925720a8c730c67db363ecb5acf
parent e7fa5658917b9623c9bcd535b3fc236dae960764
parent fe302d841d6eb7e237cab35b739852336c06f012

Merge "Fix NPE in VvmSimStateTracker"

src/com/android/phone/vvm/VvmSimStateTracker.java

diff --git a/src/com/android/phone/vvm/VvmSimStateTracker.java b/src/com/android/phone/vvm/VvmSimStateTracker.java
index 069111a..1059f86 100644
--- a/src/com/android/phone/vvm/VvmSimStateTracker.java
+++ b/src/com/android/phone/vvm/VvmSimStateTracker.java
@@ -80,12 +80,19 @@
         }
 
         public void listen() {
-            getTelephonyManager(mContext, mPhoneAccountHandle)
-                    .listen(this, PhoneStateListener.LISTEN_SERVICE_STATE);
+            TelephonyManager telephonyManager = getTelephonyManager(mContext, mPhoneAccountHandle);
+            if(telephonyManager == null){
+                VvmLog.e(TAG, "Cannot create TelephonyManager from " + mPhoneAccountHandle);
+                return;
+            }
+            telephonyManager.listen(this, PhoneStateListener.LISTEN_SERVICE_STATE);
         }
 
         public void unlisten() {
-            getTelephonyManager(mContext, mPhoneAccountHandle)
+            // TelephonyManager does not need to be pinned to an account when removing a
+            // PhoneStateListener, and mPhoneAccountHandle might be invalid at this point
+            // (e.g. SIM removal)
+            mContext.getSystemService(TelephonyManager.class)
                     .listen(this, PhoneStateListener.LISTEN_NONE);
             sListeners.put(mPhoneAccountHandle, null);
         }