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

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

@@ -446,6 +446,8 @@ public final class RemoteConnection {
private final String mCallingPackage;
private final int mTargetSdkVersion;
/**
* ConcurrentHashMap constructor params: 8 is initial table size, 0.9f is
* load factor before resizing, 1 means we only expect a single thread to
@@ -454,9 +456,12 @@ public final class RemoteConnection {
private final Set<Callback> mCallbacks = Collections.newSetFromMap(
new ConcurrentHashMap<Callback, Boolean>(8, 0.9f, 1));
VideoProvider(IVideoProvider videoProviderBinder, String callingPackage) {
VideoProvider(IVideoProvider videoProviderBinder, String callingPackage,
int targetSdkVersion) {
mVideoProviderBinder = videoProviderBinder;
mCallingPackage = callingPackage;
mTargetSdkVersion = targetSdkVersion;
try {
mVideoProviderBinder.addVideoCallback(mVideoCallbackServant.getStub().asBinder());
} catch (RemoteException e) {
@@ -491,7 +496,7 @@ public final class RemoteConnection {
*/
public void setCamera(String cameraId) {
try {
mVideoProviderBinder.setCamera(cameraId, mCallingPackage);
mVideoProviderBinder.setCamera(cameraId, mCallingPackage, mTargetSdkVersion);
} catch (RemoteException e) {
}
}
@@ -667,7 +672,7 @@ public final class RemoteConnection {
* @hide
*/
RemoteConnection(String callId, IConnectionService connectionService,
ParcelableConnection connection, String callingPackage) {
ParcelableConnection connection, String callingPackage, int targetSdkVersion) {
mConnectionId = callId;
mConnectionService = connectionService;
mConnected = true;
@@ -679,7 +684,8 @@ public final class RemoteConnection {
mVideoState = connection.getVideoState();
IVideoProvider videoProvider = connection.getVideoProvider();
if (videoProvider != null) {
mVideoProvider = new RemoteConnection.VideoProvider(videoProvider, callingPackage);
mVideoProvider = new RemoteConnection.VideoProvider(videoProvider, callingPackage,
targetSdkVersion);
} else {
mVideoProvider = null;
}