From cd6c83ac8d0e49700864e63a7adaf5dab3d9b20c Mon Sep 17 00:00:00 2001
From: SongFerngWang <songferngwang@google.com>
Date: Thu, 23 Dec 2021 00:06:03 +0800
Subject: [PATCH] [MEP] Use switchToSub API with pending intent

It is based on the framework refactor. ag/16494924  Framework
changed the API, so here modifies it.

Bug: 205504646
Test: WIP manual
Change-Id: I800b26c0eed8243a5f1c5ae8b7c42d1f9cfdb205
Merged-In: I800b26c0eed8243a5f1c5ae8b7c42d1f9cfdb205
---
 .../SwitchToEuiccSubscriptionSidecar.java     | 30 ++-----------------
 1 file changed, 2 insertions(+), 28 deletions(-)

diff --git a/src/com/android/settings/network/SwitchToEuiccSubscriptionSidecar.java b/src/com/android/settings/network/SwitchToEuiccSubscriptionSidecar.java
index 9b0105b4f03..888e5b29e9e 100644
--- a/src/com/android/settings/network/SwitchToEuiccSubscriptionSidecar.java
+++ b/src/com/android/settings/network/SwitchToEuiccSubscriptionSidecar.java
@@ -18,7 +18,6 @@ package com.android.settings.network;
 
 import android.app.FragmentManager;
 import android.app.PendingIntent;
-import android.content.Intent;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.UiccCardInfo;
@@ -106,21 +105,8 @@ public class SwitchToEuiccSubscriptionSidecar extends EuiccOperationSidecar {
             // Use INVALID_SUBSCRIPTION_ID to disable the esim profile.
             // The SimSlotMapping is ready, then to execute activate/inactivate esim.
             mIsDuringSimSlotMapping = true;
-            EuiccManager.ResultListener callback = new EuiccManager.ResultListener() {
-                @Override
-                public void onComplete(int resultCode, Intent resultIntent) {
-                    Log.i(TAG, String.format("Result code : %d;", resultCode));
-                    if (resultCode == EuiccManager.EMBEDDED_SUBSCRIPTION_RESULT_OK) {
-                        mSwitchSlotSidecar.runSwitchToEuiccSlot(getTargetSlot(), mPort,
-                                removedSubInfo);
-                    } else {
-                        setState(State.ERROR, resultCode);
-                    }
-                }
-            };
             mEuiccManager.switchToSubscription(SubscriptionManager.INVALID_SUBSCRIPTION_ID, mPort,
-                    getContext().getMainExecutor(),
-                    callback);
+                    mCallbackIntent);
         } else {
             mSwitchSlotSidecar.runSwitchToEuiccSlot(getTargetSlot(), mPort, removedSubInfo);
         }
@@ -187,19 +173,7 @@ public class SwitchToEuiccSubscriptionSidecar extends EuiccOperationSidecar {
 
     private void switchToSubscription() {
         // The SimSlotMapping is ready, then to execute activate/inactivate esim.
-        EuiccManager.ResultListener callback = new EuiccManager.ResultListener() {
-            @Override
-            public void onComplete(int resultCode, Intent resultIntent) {
-                Log.i(TAG, String.format("Result code : %d;", resultCode));
-                if (resultCode == EuiccManager.EMBEDDED_SUBSCRIPTION_RESULT_OK) {
-                    setState(State.SUCCESS, Substate.UNUSED);
-                } else {
-                    setState(State.ERROR, resultCode);
-                }
-            }
-        };
-        mEuiccManager.switchToSubscription(mSubId, mPort, getContext().getMainExecutor(),
-                callback);
+        mEuiccManager.switchToSubscription(mSubId, mPort, mCallbackIntent);
     }
 
     @Override