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

Commit 8e245e15 authored by Evan Chen's avatar Evan Chen
Browse files

Remove the linked reference and deprecated keyword 

Remove refers to non-public @flaggedAPI's from the public docs.
Will add them back once the API is finalized.

Also removed the deprecated keyword and add it back when
next window for API changes opens

Test: m && cts
Fix: 310900277
Change-Id: If44b8a453de9401cc9ae87be98d737de5d1cabc7
parent bf67785a

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -9705,9 +9705,9 @@ package android.companion { 
    method @RequiresPermission(android.Manifest.permission.DELIVER_COMPANION_MESSAGES) public final void detachSystemDataTransport(int) throws android.companion.DeviceNotAssociatedException;

    method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);

    method @Deprecated @MainThread public void onDeviceAppeared(@NonNull String);

    method @Deprecated @MainThread public void onDeviceAppeared(@NonNull android.companion.AssociationInfo);

    method @MainThread public void onDeviceAppeared(@NonNull android.companion.AssociationInfo);

    method @Deprecated @MainThread public void onDeviceDisappeared(@NonNull String);

    method @Deprecated @MainThread public void onDeviceDisappeared(@NonNull android.companion.AssociationInfo);

    method @MainThread public void onDeviceDisappeared(@NonNull android.companion.AssociationInfo);

    method @FlaggedApi("android.companion.device_presence") @MainThread public void onDeviceEvent(@NonNull android.companion.AssociationInfo, int);

    field @FlaggedApi("android.companion.device_presence") public static final int DEVICE_EVENT_BLE_APPEARED = 0; // 0x0

    field @FlaggedApi("android.companion.device_presence") public static final int DEVICE_EVENT_BLE_DISAPPEARED = 1; // 0x1

core/java/android/companion/CompanionDeviceService.java

+0 −7
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import java.util.concurrent.Executor; 


/**

 * A service that receives calls from the system with device events.

 * See {@link #onDeviceEvent(AssociationInfo, int)}.

 *

 * <p>

 * Companion applications must create a service that {@code extends}
@@ -311,10 +310,7 @@ public abstract class CompanionDeviceService extends Service { 
     * Called by system whenever a device associated with this app is connected.

     *

     * @param associationInfo A record for the companion device.

     *

     * @deprecated please override {@link #onDeviceEvent(AssociationInfo, int)} instead.

     */

    @Deprecated

    @MainThread

    public void onDeviceAppeared(@NonNull AssociationInfo associationInfo) {

        if (!associationInfo.isSelfManaged()) {
@@ -326,10 +322,7 @@ public abstract class CompanionDeviceService extends Service { 
     * Called by system whenever a device associated with this app is disconnected.

     *

     * @param associationInfo A record for the companion device.

     *

     * @deprecated please override {@link #onDeviceEvent(AssociationInfo, int)} instead.

     */

    @Deprecated

    @MainThread

    public void onDeviceDisappeared(@NonNull AssociationInfo associationInfo) {

        if (!associationInfo.isSelfManaged()) {