commit 4c3f454c92561d9696b5cc1eb044125703a8be62
author Bonian Chen <bonianchen@google.com> Fri Sep 10 09:46:32 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 10 09:46:32 2021 +0000
tree ca7a0c7445c04c971b5bb617c83de87356ec7449
parent f4e2f69f3a44820155b0c7b4a51d65ee2b395044
parent 638f12a6c81125ba19fdbad9eadc7fd9bc176d64

Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed"

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 78c4036..d8c528b 100644
--- a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
+++ b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
@@ -77,9 +77,6 @@
             mPhoneStateListener = new PhoneCallStateListener();
         }
 
-        if (mSubId == subId) {
-            return this;
-        }
         mSubId = subId;
         final PersistableBundle carrierConfig = getCarrierConfigForSubId(subId);
         if (carrierConfig == null) {
@@ -130,7 +127,7 @@
 
     @Override
     public void onStart() {
-        if (!isModeMatched() || (mPhoneStateListener == null)) {
+        if (mPhoneStateListener == null) {
             return;
         }
         mPhoneStateListener.register(mContext, mSubId);