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

Commit 8e06c9bd authored by Evan Chen's avatar Evan Chen Committed by Android (Google) Code Review
Browse files

Merge "Add @TestApi onBindCompanionDeviceService()"

parents 857d00ef 468648bf
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -685,6 +685,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 {
+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;
@@ -168,6 +169,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,
@@ -175,6 +177,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