commit 5ec326b56ea1e0eddd7c8c577b0f268bf95401e2
author Zoey Chen <zoeychen@google.com> Mon Feb 22 21:21:28 2021 +0800
committer Zoey Chen <zoeychen@google.com> Fri Feb 26 13:54:24 2021 +0800
tree ca9ec92625c24707c00d4a25976e57571e752b0d
parent 11b8166bea39c415df0827427393f845e71d4e81

[Telephony] Use TelephonyCallback instead of PhoneStateListener part4

Since the redesign of PhoneStateListener, use TelephonyCallback to get the callback of EVENT_*

Bug: 167684594
Test: make
Change-Id: Ica74875c6ee3c5e0901e19cc878dd8aa9042d350

src/com/android/phone/CallFeaturesSetting.java

diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index 2fcc2ee..7aee51f 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -43,8 +43,8 @@
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.telephony.CarrierConfigManager;
-import android.telephony.PhoneStateListener;
 import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyCallback;
 import android.telephony.TelephonyManager;
 import android.telephony.ims.ProvisioningManager;
 import android.telephony.ims.feature.ImsFeature;
@@ -106,7 +106,7 @@
     private ImsManager mImsMgr;
     private SubscriptionInfoHelper mSubscriptionInfoHelper;
     private TelecomManager mTelecomManager;
-    private PhoneStateListener mPhoneStateListener;
+    private TelephonyCallback mTelephonyCallback;
 
     private SwitchPreference mButtonAutoRetry;
     private PreferenceScreen mVoicemailSettingsScreen;
@@ -267,7 +267,7 @@
         mSubscriptionInfoHelper.setActionBarTitle(
                 getActionBar(), getResourcesForSubId(), R.string.call_settings_with_label);
         mTelecomManager = getSystemService(TelecomManager.class);
-        mPhoneStateListener = new CallFeaturesPhoneStateListener();
+        mTelephonyCallback = new CallFeaturesTelephonyCallback();
     }
 
     private void updateImsManager(Phone phone) {
@@ -285,15 +285,15 @@
         TelephonyManager telephonyManager = getSystemService(TelephonyManager.class)
                 .createForSubscriptionId(mPhone.getSubId());
         if (listen) {
-            telephonyManager.registerPhoneStateListener(
-                    new HandlerExecutor(new Handler(Looper.getMainLooper())), mPhoneStateListener);
+            telephonyManager.registerTelephonyCallback(
+                    new HandlerExecutor(new Handler(Looper.getMainLooper())), mTelephonyCallback);
         } else {
-            telephonyManager.unregisterPhoneStateListener(mPhoneStateListener);
+            telephonyManager.unregisterTelephonyCallback(mTelephonyCallback);
         }
     }
 
-    private final class CallFeaturesPhoneStateListener extends PhoneStateListener implements
-            PhoneStateListener.CallStateChangedListener {
+    private final class CallFeaturesTelephonyCallback extends TelephonyCallback implements
+            TelephonyCallback.CallStateListener {
         @Override
         public void onCallStateChanged(int state, String incomingNumber) {
             if (DBG) log("PhoneStateListener onCallStateChanged: state is " + state);