Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make queryRemoteConnectionServices DSDS aware." into qt-dev

Browse Source
This commit is contained in:
Tyler Gunn
2019-05-21 15:18:59 +00:00
committed by Android (Google) Code Review
parent d6e996ca18 4c69fb3d7b
commit ac9d572269
5 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telecomm/java/android/telecom/ConnectionService.java
View File

@@ -1937,6 +1937,8 @@ public abstract class ConnectionService extends Service {
return; return;
} }
String callingPackage = getOpPackageName();
mAdapter.queryRemoteConnectionServices(new RemoteServiceCallback.Stub() { mAdapter.queryRemoteConnectionServices(new RemoteServiceCallback.Stub() {
@Override @Override
public void onResult( public void onResult(
@@ -1965,7 +1967,7 @@ public abstract class ConnectionService extends Service {
} }
}.prepare()); }.prepare());
} }
}); }, callingPackage);
} }
/** /**

4
telecomm/java/android/telecom/ConnectionServiceAdapter.java
View File

@@ -316,11 +316,11 @@ final class ConnectionServiceAdapter implements DeathRecipient {
/** /**
* Retrieves a list of remote connection services usable to place calls. * Retrieves a list of remote connection services usable to place calls.
*/ */
void queryRemoteConnectionServices(RemoteServiceCallback callback) { void queryRemoteConnectionServices(RemoteServiceCallback callback, String callingPackage) {
// Only supported when there is only one adapter. // Only supported when there is only one adapter.
if (mAdapters.size() == 1) { if (mAdapters.size() == 1) {
try { try {
mAdapters.iterator().next().queryRemoteConnectionServices(callback, mAdapters.iterator().next().queryRemoteConnectionServices(callback, callingPackage,
Log.getExternalSession()); Log.getExternalSession());
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(this, e, "Exception trying to query for remote CSs"); Log.e(this, e, "Exception trying to query for remote CSs");

14
telecomm/java/android/telecom/ConnectionServiceAdapterServant.java
View File

@@ -186,8 +186,13 @@ final class ConnectionServiceAdapterServant {
break; break;
} }
case MSG_QUERY_REMOTE_CALL_SERVICES: case MSG_QUERY_REMOTE_CALL_SERVICES:
mDelegate.queryRemoteConnectionServices((RemoteServiceCallback) msg.obj, SomeArgs args2 = (SomeArgs) msg.obj;
null /*Session.Info*/); try {
mDelegate.queryRemoteConnectionServices((RemoteServiceCallback) args2.arg1,
(String) args2.arg2, null /*Session.Info*/);
} finally {
args2.recycle();
}
break; break;
case MSG_SET_VIDEO_STATE: case MSG_SET_VIDEO_STATE:
mDelegate.setVideoState((String) msg.obj, msg.arg1, null /*Session.Info*/); mDelegate.setVideoState((String) msg.obj, msg.arg1, null /*Session.Info*/);
@@ -468,7 +473,10 @@ final class ConnectionServiceAdapterServant {
@Override @Override
public void queryRemoteConnectionServices(RemoteServiceCallback callback, public void queryRemoteConnectionServices(RemoteServiceCallback callback,
Session.Info sessionInfo) { String callingPackage, Session.Info sessionInfo) {
SomeArgs args = SomeArgs.obtain();
args.arg1 = callback;
args.arg2 = callingPackage;
mHandler.obtainMessage(MSG_QUERY_REMOTE_CALL_SERVICES, callback).sendToTarget(); mHandler.obtainMessage(MSG_QUERY_REMOTE_CALL_SERVICES, callback).sendToTarget();
} }

2
telecomm/java/android/telecom/RemoteConnectionService.java
View File

@@ -288,7 +288,7 @@ final class RemoteConnectionService {
@Override @Override
public void queryRemoteConnectionServices(RemoteServiceCallback callback, public void queryRemoteConnectionServices(RemoteServiceCallback callback,
Session.Info sessionInfo) { String callingPackage, Session.Info sessionInfo) {
// Not supported from remote connection service. // Not supported from remote connection service.
} }

3
telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl
View File

@@ -78,7 +78,8 @@ oneway interface IConnectionServiceAdapter {
void onPostDialChar(String callId, char nextChar, in Session.Info sessionInfo); void onPostDialChar(String callId, char nextChar, in Session.Info sessionInfo);
void queryRemoteConnectionServices(RemoteServiceCallback callback, in Session.Info sessionInfo); void queryRemoteConnectionServices(RemoteServiceCallback callback, String callingPackage,
in Session.Info sessionInfo);
void setVideoProvider(String callId, IVideoProvider videoProvider, in Session.Info sessionInfo); void setVideoProvider(String callId, IVideoProvider videoProvider, in Session.Info sessionInfo);