commit 967311df7fc238bda4e16b380f3a5144aba06202
author Bonian Chen <bonianchen@google.com> Thu Nov 26 07:35:21 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 26 07:35:21 2020 +0000
tree 3b2500e7c1d4eb054b7161df753df7a8bde076b0
parent 3c934b2859e4a2ed708dd991f6200b52eade6f64
parent f9256b41f2dcee6ba1e2642a46d9416e26616397

Merge "[Settings] Reduce the operation of VoLTE config redraw"

src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java

diff --git a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
index 0484632..ba12146 100644
--- a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
+++ b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
@@ -127,7 +127,7 @@
 
     @Override
     public void onStart() {
-        if (mPhoneStateListener == null) {
+        if (!isModeMatched() || (mPhoneStateListener == null)) {
             return;
         }
         mPhoneStateListener.register(mContext, mSubId);
@@ -241,7 +241,9 @@
 
         public void unregister() {
             mCallState = null;
-            mTelephonyManager.listen(this, PhoneStateListener.LISTEN_NONE);
+            if (mTelephonyManager != null) {
+                mTelephonyManager.listen(this, PhoneStateListener.LISTEN_NONE);
+            }
         }
     }