Revert "MSIM: set phone account handle changes for ECall"

This reverts commit fbdf0855fddd7bff5e648ad820753d8dcaf70840
to fix CTS failures

Change-Id: I7248110607f6910ca1747abb0417961201455ecc

1 files changed, 1 insertions, 19 deletions

diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java
index 306b7e4..1560af8 100644
--- a/telecomm/java/android/telecom/ConnectionService.java
+++ b/telecomm/java/android/telecom/ConnectionService.java
@@ -627,12 +627,6 @@ public abstract class ConnectionService extends Service {
         }
 
         @Override
-        public void onPhoneAccountChanged(Connection c, PhoneAccountHandle pHandle) {
-            String id = mIdByConnection.get(c);
-            Log.i(this, "Adapter onPhoneAccountChanged %s, %s", c, pHandle);
-            mAdapter.setPhoneAccountHandle(id, pHandle);
-        }
-
         public void onCdmaConnectionTimeReset(Connection c) {
             String id = mIdByConnection.get(c);
             mAdapter.resetCdmaConnectionTime(id);
@@ -692,7 +686,7 @@ public abstract class ConnectionService extends Service {
                 callId,
                 request,
                 new ParcelableConnection(
-                        getAccountHandle(request, connection),
+                        request.getAccountHandle(),
                         connection.getState(),
                         connection.getConnectionCapabilities(),
                         connection.getAddress(),
@@ -714,18 +708,6 @@ public abstract class ConnectionService extends Service {
         }
     }
 
-    /** @hide */
-    public PhoneAccountHandle getAccountHandle(
-            final ConnectionRequest request, Connection connection) {
-        PhoneAccountHandle pHandle = connection.getPhoneAccountHandle();
-        if (pHandle != null) {
-            Log.i(this, "getAccountHandle, return account handle from local, %s", pHandle);
-            return pHandle;
-        } else {
-            return request.getAccountHandle();
-        }
-    }
-
     private void abort(String callId) {
         Log.d(this, "abort %s", callId);
         findConnectionForAction(callId, "abort").onAbort();