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

Merge "API review cleanups/changes." am: 9324d6513b am: dd4bc7c69c

Browse Source 
am: c49b011151

Change-Id: Ib3d76474bef8c911b2ec6a61b916e38af0a3b861
This commit is contained in:
Tyler Gunn
2017-03-07 03:05:23 +00:00
committed by android-build-merger
parent c2cf8e0b0c c49b011151
commit 356322fb1e
14 changed files with 121 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -286,10 +286,11 @@ final class RemoteConnectionService {
String callingPackage = mOurConnectionServiceImpl.getApplicationContext()
.getOpPackageName();
int targetSdkVersion = mOurConnectionServiceImpl.getApplicationInfo().targetSdkVersion;
RemoteConnection.VideoProvider remoteVideoProvider = null;
if (videoProvider != null) {
remoteVideoProvider = new RemoteConnection.VideoProvider(videoProvider,
callingPackage);
callingPackage, targetSdkVersion);
}
findConnectionForAction(callId, "setVideoProvider")
.setVideoProvider(remoteVideoProvider);
@@ -357,8 +358,11 @@ final class RemoteConnectionService {
Session.Info sessionInfo) {
String callingPackage = mOurConnectionServiceImpl.getApplicationContext().
getOpPackageName();
int callingTargetSdkVersion = mOurConnectionServiceImpl.getApplicationInfo()
.targetSdkVersion;
RemoteConnection remoteConnection = new RemoteConnection(callId,
mOutgoingConnectionServiceRpc, connection, callingPackage);
mOutgoingConnectionServiceRpc, connection, callingPackage,
callingTargetSdkVersion);
mConnectionById.put(callId, remoteConnection);
remoteConnection.registerCallback(new RemoteConnection.Callback() {
@Override