commit 4567efc2fc1cca244296f0a34d70bb9facaa2ce4
author Brad Ebinger <breadley@google.com> Mon Feb 05 23:15:46 2018 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 05 23:15:46 2018 +0000
tree 956fd59360452fd6cbbe76acd691b240e8f3d297
parent 2e1f02dfe71d78ac3e6ea15a18a5391128b93f50
parent 8409c97036c1c579150195551365fbde20da12a8

Integrate new ImsCallSessionListener
am: 8409c97036

Change-Id: I08fd6b540ab77ac26da6dbac04a177e174c0b525

src/java/com/android/ims/ImsManager.java

diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java
index e3d17e1..eaf973d 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -2006,7 +2006,7 @@
             ImsCallProfile profile) throws ImsException {
         try {
             // Throws an exception if the ImsService Feature is not ready to accept commands.
-            return new ImsCallSession(mImsServiceProxy.createCallSession(serviceId, profile, null));
+            return new ImsCallSession(mImsServiceProxy.createCallSession(serviceId, profile));
         } catch (RemoteException e) {
             Rlog.w(TAG, "CreateCallSession: Error, remote exception: " + e.getMessage());
             throw new ImsException("createCallSession()", e,

src/java/com/android/ims/ImsServiceProxy.java

diff --git a/src/java/com/android/ims/ImsServiceProxy.java b/src/java/com/android/ims/ImsServiceProxy.java
index 4ac8fea..a874436 100644
--- a/src/java/com/android/ims/ImsServiceProxy.java
+++ b/src/java/com/android/ims/ImsServiceProxy.java
@@ -24,13 +24,13 @@
 import android.os.RemoteException;
 import android.telephony.Rlog;
 import android.telephony.TelephonyManager;
+import android.telephony.ims.aidl.IImsCallSessionListener;
 import android.telephony.ims.feature.ImsFeature;
 import android.telephony.SmsMessage;
 import android.telephony.ims.internal.stub.SmsImplBase;
 import android.util.Log;
 
 import com.android.ims.internal.IImsCallSession;
-import com.android.ims.internal.IImsCallSessionListener;
 import com.android.ims.internal.IImsConfig;
 import com.android.ims.internal.IImsEcbm;
 import com.android.ims.internal.IImsMMTelFeature;
@@ -228,11 +228,11 @@
         }
     }
 
-    public IImsCallSession createCallSession(int sessionId, ImsCallProfile profile,
-            IImsCallSessionListener listener) throws RemoteException {
+    public IImsCallSession createCallSession(int sessionId, ImsCallProfile profile)
+            throws RemoteException {
         synchronized (mLock) {
             checkServiceIsReady();
-            return getServiceInterface(mBinder).createCallSession(sessionId, profile, listener);
+            return getServiceInterface(mBinder).createCallSession(sessionId, profile);
         }
     }
 

src/java/com/android/ims/ImsServiceProxyCompat.java

diff --git a/src/java/com/android/ims/ImsServiceProxyCompat.java b/src/java/com/android/ims/ImsServiceProxyCompat.java
index a6d1865..d5f211a 100644
--- a/src/java/com/android/ims/ImsServiceProxyCompat.java
+++ b/src/java/com/android/ims/ImsServiceProxyCompat.java
@@ -123,10 +123,10 @@
     }
 
     @Override
-    public IImsCallSession createCallSession(int sessionId, ImsCallProfile profile,
-            IImsCallSessionListener listener) throws RemoteException {
+    public IImsCallSession createCallSession(int sessionId, ImsCallProfile profile)
+            throws RemoteException {
         checkBinderConnection();
-        return getServiceInterface(mBinder).createCallSession(sessionId, profile, listener);
+        return getServiceInterface(mBinder).createCallSession(sessionId, profile, null);
     }
 
     @Override