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

7 files changed, 1 insertions, 93 deletions

diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java
index c02eee2..f025955 100644
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -455,7 +455,6 @@ public abstract class Connection extends Conferenceable {
         public void onConferenceStarted() {}
         public void onConferenceMergeFailed(Connection c) {}
         public void onExtrasChanged(Connection c, Bundle extras) {}
-        public void onPhoneAccountChanged(Connection c, PhoneAccountHandle pHandle) {}
         public void onCdmaConnectionTimeReset(Connection c) {}
     }
 
@@ -1119,7 +1118,6 @@ public abstract class Connection extends Conferenceable {
     private Conference mConference;
     private ConnectionService mConnectionService;
     private Bundle mExtras;
-    private PhoneAccountHandle mPhoneAccountHandle = null;
 
     /**
      * Create a new Connection.
@@ -1639,23 +1637,6 @@ public abstract class Connection extends Conferenceable {
     }
 
     /**
-     * @hide.
-     */
-    public final void setPhoneAccountHandle(PhoneAccountHandle pHandle) {
-        mPhoneAccountHandle = pHandle;
-        for (Listener l : mListeners) {
-            l.onPhoneAccountChanged(this, pHandle);
-        }
-    }
-
-    /**
-     * @hide.
-     */
-    public final PhoneAccountHandle getPhoneAccountHandle() {
-        return mPhoneAccountHandle;
-    }
-
-    /**
      * @hide
      */
     public final void setConnectionService(ConnectionService connectionService) {
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();
diff --git a/telecomm/java/android/telecom/ConnectionServiceAdapter.java b/telecomm/java/android/telecom/ConnectionServiceAdapter.java
index f59427d..30bd373 100644
--- a/telecomm/java/android/telecom/ConnectionServiceAdapter.java
+++ b/telecomm/java/android/telecom/ConnectionServiceAdapter.java
@@ -424,14 +424,4 @@ final class ConnectionServiceAdapter implements DeathRecipient {
             }
         }
     }
-
-    void setPhoneAccountHandle(String callId, PhoneAccountHandle pHandle) {
-        Log.v(this, "setPhoneAccountHandle: %s, %s", callId, pHandle);
-        for (IConnectionServiceAdapter adapter : mAdapters) {
-            try {
-                adapter.setPhoneAccountHandle(callId, pHandle);
-            } catch (RemoteException ignored) {
-            }
-        }
-    }
 }
diff --git a/telecomm/java/android/telecom/ConnectionServiceAdapterServant.java b/telecomm/java/android/telecom/ConnectionServiceAdapterServant.java
index feaa89e..b8e7c22 100644
--- a/telecomm/java/android/telecom/ConnectionServiceAdapterServant.java
+++ b/telecomm/java/android/telecom/ConnectionServiceAdapterServant.java
@@ -62,7 +62,6 @@ final class ConnectionServiceAdapterServant {
     private static final int MSG_ON_POST_DIAL_CHAR = 22;
     private static final int MSG_SET_CONFERENCE_MERGE_FAILED = 23;
     private static final int MSG_SET_EXTRAS = 24;
-    private static final int MSG_SET_PHONE_ACCOUNT = 25;
 
     private final IConnectionServiceAdapter mDelegate;
 
@@ -224,16 +223,6 @@ final class ConnectionServiceAdapterServant {
                     }
                     break;
                 }
-                case MSG_SET_PHONE_ACCOUNT: {
-                    SomeArgs args = (SomeArgs) msg.obj;
-                    try {
-                        mDelegate.setPhoneAccountHandle(
-                                (String) args.arg1, (PhoneAccountHandle) args.arg2);
-                    } finally {
-                        args.recycle();
-                    }
-                    break;
-                }
                 case MSG_SET_CONFERENCE_MERGE_FAILED: {
                     SomeArgs args = (SomeArgs) msg.obj;
                     try {
@@ -431,13 +420,6 @@ final class ConnectionServiceAdapterServant {
             mHandler.obtainMessage(MSG_SET_EXTRAS, args).sendToTarget();
         }
 
-        public final void setPhoneAccountHandle(String connectionId, PhoneAccountHandle pHandle) {
-            SomeArgs args = SomeArgs.obtain();
-            args.arg1 = connectionId;
-            args.arg2 = pHandle;
-            mHandler.obtainMessage(MSG_SET_PHONE_ACCOUNT, args).sendToTarget();
-        }
-
         @Override
         public void resetCdmaConnectionTime(String callId) {
         }
diff --git a/telecomm/java/android/telecom/RemoteConnection.java b/telecomm/java/android/telecom/RemoteConnection.java
index 3cb8058..f960959 100644
--- a/telecomm/java/android/telecom/RemoteConnection.java
+++ b/telecomm/java/android/telecom/RemoteConnection.java
@@ -209,11 +209,6 @@ public final class RemoteConnection {
          * @param extras The extras containing other information associated with the connection.
          */
         public void onExtrasChanged(RemoteConnection connection, @Nullable Bundle extras) {}
-
-        /** @hide */
-        public void setPhoneAccountHandle(
-                RemoteConnection connection,
-                PhoneAccountHandle pHandle) {}
     }
 
     /**
@@ -1296,20 +1291,6 @@ public final class RemoteConnection {
         }
     }
 
-    /** @hide */
-    void setPhoneAccountHandle(final PhoneAccountHandle pHandle) {
-        for (CallbackRecord record : mCallbackRecords) {
-            final RemoteConnection connection = this;
-            final Callback callback = record.getCallback();
-            record.getHandler().post(new Runnable() {
-                @Override
-                public void run() {
-                    callback.setPhoneAccountHandle(connection, pHandle);
-                }
-            });
-        }
-    }
-
     /**
      * Create a RemoteConnection represents a failure, and which will be in
      * {@link Connection#STATE_DISCONNECTED}. Attempting to use it for anything will almost
diff --git a/telecomm/java/android/telecom/RemoteConnectionService.java b/telecomm/java/android/telecom/RemoteConnectionService.java
index eead32a..372d736 100644
--- a/telecomm/java/android/telecom/RemoteConnectionService.java
+++ b/telecomm/java/android/telecom/RemoteConnectionService.java
@@ -331,11 +331,6 @@ final class RemoteConnectionService {
             }
         }
 
-        public void setPhoneAccountHandle(String callId, PhoneAccountHandle pHandle) {
-            findConnectionForAction(callId, "setPhoneAccountHandle")
-                    .setPhoneAccountHandle(pHandle);
-        }
-
         @Override
         public void resetCdmaConnectionTime(String callId) {
         }
diff --git a/telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl b/telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl
index aaefbaf..ef4915c 100644
--- a/telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl
+++ b/telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl
@@ -23,7 +23,6 @@ import android.telecom.ConnectionRequest;
 import android.telecom.DisconnectCause;
 import android.telecom.ParcelableConnection;
 import android.telecom.ParcelableConference;
-import android.telecom.PhoneAccountHandle;
 import android.telecom.StatusHints;
 
 import com.android.internal.telecom.IVideoProvider;
@@ -88,7 +87,5 @@ oneway interface IConnectionServiceAdapter {
 
     void setExtras(String callId, in Bundle extras);
 
-    void setPhoneAccountHandle(String callId, in PhoneAccountHandle pHandle);
-
     void resetCdmaConnectionTime(String callId);
 }