Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40a22b24 authored by Hall Liu's avatar Hall Liu Committed by Automerger Merge Worker
Browse files

Merge "Add onBindClient for testing" am: 53252b14 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2f48ba063315842a07972dac2cfce9b01befad4
parents 5028f892 53252b14

core/api/test-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -1604,6 +1604,10 @@ package android.telecom { 
    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 {

telecomm/java/android/telecom/ConnectionService.java

+9 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.SdkConstant;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.app.Service;

import android.content.ComponentName;

import android.content.Intent;
@@ -1887,6 +1888,7 @@ public abstract class ConnectionService extends Service { 
    /** {@inheritDoc} */

    @Override

    public final IBinder onBind(Intent intent) {

        onBindClient(intent);

        return mBinder;

    }
@@ -1897,6 +1899,13 @@ public abstract class ConnectionService extends Service { 
        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