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

Commit 468648bf authored by Sergey Nikolaienkov's avatar Sergey Nikolaienkov
Browse files

Add @TestApi onBindCompanionDeviceService() 

Add onBindCompanionDeviceService() method to CompanionDeviceService,
which is invoked from onBind(). This allows to track the state of
incoming Binder connection in CTS tests, which was not possible before,
since onBind() method in CompanionDeviceService is final.

Bug: 199435613
Test: atest CtsCompanionDevicesTestCases:SelfPresenceReportingTest
Test: atest CtsCompanionDevicesTestCases
Change-Id: I37cd3be15ed41b466ef9c6cead781299fd82356e
parent 21684a25

core/api/test-current.txt

+8 −0
Original line number Diff line number Diff line
@@ -692,6 +692,14 @@ package android.bluetooth { 


}



package android.companion {



  public abstract class CompanionDeviceService extends android.app.Service {

    method public void onBindCompanionDeviceService(@NonNull android.content.Intent);

  }



}



package android.content {



  public final class AttributionSource implements android.os.Parcelable {

core/java/android/companion/CompanionDeviceService.java

+10 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.annotation.MainThread; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.TestApi;

import android.app.Service;

import android.content.Intent;

import android.os.Handler;
@@ -122,6 +123,7 @@ public abstract class CompanionDeviceService extends Service { 
    @Override

    public final IBinder onBind(@NonNull Intent intent) {

        if (Objects.equals(intent.getAction(), SERVICE_INTERFACE)) {

            onBindCompanionDeviceService(intent);

            return mRemote;

        }

        Log.w(LOG_TAG,
@@ -129,6 +131,14 @@ public abstract class CompanionDeviceService extends Service { 
        return null;

    }



    /**

     * Used to track the state of Binder connection in CTS tests.

     * @hide

     */

    @TestApi

    public void onBindCompanionDeviceService(@NonNull Intent intent) {

    }



    class Stub extends ICompanionDeviceService.Stub {



        @Override