Merge tag 'LA.QSSI.14.0.r1-16500-qssi.0' into uminekoumineko

LA.QSSI.14.0.r1-16500-qssi.0

Change-Id: I28f8c29a901718b969036c5cda5d287d5768d1a9

1 files changed, 9 insertions, 1 deletions

diff --git a/src/com/android/phone/CallForwardEditPreference.java b/src/com/android/phone/CallForwardEditPreference.java
index d9db928b9d..90885c6141 100644
--- a/src/com/android/phone/CallForwardEditPreference.java
+++ b/src/com/android/phone/CallForwardEditPreference.java
@@ -1,3 +1,9 @@
+/**
+* Changes from Qualcomm Innovation Center, Inc. are provided under the following license:
+* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+* SPDX-License-Identifier: BSD-3-Clause-Clear
+*/
+
 package com.android.phone;
 
 import static com.android.phone.TimeConsumingPreferenceActivity.EXCEPTION_ERROR;
@@ -119,6 +125,8 @@ public class CallForwardEditPreference extends EditPhoneNumberPreference {
                 CommandsInterface.CF_REASON_UNCONDITIONAL);
         a.recycle();
 
+        mExtTelephonyManager = ExtTelephonyManager.getInstance(getContext());
+
         Log.d(LOG_TAG, "mServiceClass=" + mServiceClass + ", reason=" + reason);
     }
 
@@ -137,7 +145,6 @@ public class CallForwardEditPreference extends EditPhoneNumberPreference {
         Log.d(LOG_TAG,
                 "init :mReplaceInvalidCFNumber " + mReplaceInvalidCFNumber + ", mCallForwardByUssd "
                         + mCallForwardByUssd);
-        mExtTelephonyManager = ExtTelephonyManager.getInstance(getContext());
         if (mCallForwardByUssd) {
             mCfInfo = new HashMap<String, String>();
             TelephonyManager telephonyManager = new TelephonyManager(getContext(),
@@ -179,6 +186,7 @@ public class CallForwardEditPreference extends EditPhoneNumberPreference {
             mQtiImsExtManager = null;
             mIsTimerEnabled = false;
         }
+        mExtTelephonyManager.unregisterCallback(mExtPhoneCallbackListener);
     }
 
     private boolean isUtUnavailableForVideoCallForward() {