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

Merge "Add onBindClient for testing" am: 53252b14e5

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625243

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2f48ba063315842a07972dac2cfce9b01befad4
This commit is contained in:
Hall Liu
2021-03-10 20:14:10 +00:00
committed by Automerger Merge Worker
parent 5028f8923a 53252b14e5
commit 40a22b24b0
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/test-current.txt
View File

@@ -1604,6 +1604,10 @@ package android.telecom {
method @NonNull public android.telecom.ConnectionRequest.Builder setVideoState(int); method @NonNull public android.telecom.ConnectionRequest.Builder setVideoState(int);
} }
public abstract class ConnectionService extends android.app.Service {
method public void onBindClient(@Nullable android.content.Intent);
}
} }
package android.telephony { package android.telephony {

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

@@ -20,6 +20,7 @@ import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.SdkConstant; import android.annotation.SdkConstant;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.app.Service; import android.app.Service;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Intent; import android.content.Intent;
@@ -1887,6 +1888,7 @@ public abstract class ConnectionService extends Service {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public final IBinder onBind(Intent intent) { public final IBinder onBind(Intent intent) {
onBindClient(intent);
return mBinder; return mBinder;
} }
@@ -1897,6 +1899,13 @@ public abstract class ConnectionService extends Service {
return super.onUnbind(intent); return super.onUnbind(intent);
} }
/**
* Used for testing to let the test suite know when the connection service has been bound.
* @hide
*/
@TestApi
public void onBindClient(@Nullable Intent intent) {
}
/** /**
* This can be used by telecom to either create a new outgoing conference call or attach * This can be used by telecom to either create a new outgoing conference call or attach