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

Commit 87c6e58b authored by Evan Chen's avatar Evan Chen
Browse files

Clean up flags that already launched 

The flags included:
1. android.companion.device_presence
2. android.companion.association_failure_code
3. android.companion.new_association_builder

Test: cts
bug: 330793558
fix: 418792859
Flag: android.companion.device_presence
Change-Id: I6c37e91ede557b72a2d58ecef4903ec789126545
parent 03fb9e8f

core/api/current.txt

+11 −11
Original line number Diff line number Diff line
@@ -10377,11 +10377,11 @@ package android.companion { 
    method @FlaggedApi("android.companion.unpair_associated_device") @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean removeBond(int);

    method public void requestNotificationAccess(android.content.ComponentName);

    method @Deprecated @FlaggedApi("android.companion.association_verification") public void setDeviceId(int, @Nullable android.companion.DeviceId);

    method @Deprecated @FlaggedApi("android.companion.device_presence") @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) public void startObservingDevicePresence(@NonNull String) throws android.companion.DeviceNotAssociatedException;

    method @FlaggedApi("android.companion.device_presence") @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) public void startObservingDevicePresence(@NonNull android.companion.ObservingDevicePresenceRequest);

    method @Deprecated @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) public void startObservingDevicePresence(@NonNull String) throws android.companion.DeviceNotAssociatedException;

    method @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) public void startObservingDevicePresence(@NonNull android.companion.ObservingDevicePresenceRequest);

    method public void startSystemDataTransfer(int, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,android.companion.CompanionException>) throws android.companion.DeviceNotAssociatedException;

    method @Deprecated @FlaggedApi("android.companion.device_presence") @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) public void stopObservingDevicePresence(@NonNull String) throws android.companion.DeviceNotAssociatedException;

    method @FlaggedApi("android.companion.device_presence") @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) public void stopObservingDevicePresence(@NonNull android.companion.ObservingDevicePresenceRequest);

    method @Deprecated @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) public void stopObservingDevicePresence(@NonNull String) throws android.companion.DeviceNotAssociatedException;

    method @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) public void stopObservingDevicePresence(@NonNull android.companion.ObservingDevicePresenceRequest);

    field public static final String EXTRA_ASSOCIATION = "android.companion.extra.ASSOCIATION";

    field @Deprecated public static final String EXTRA_DEVICE = "android.companion.extra.DEVICE";

    field public static final int FLAG_CALL_METADATA = 1; // 0x1
@@ -10389,7 +10389,7 @@ package android.companion { 
    field public static final int RESULT_DISCOVERY_TIMEOUT = 2; // 0x2

    field public static final int RESULT_INTERNAL_ERROR = 3; // 0x3

    field public static final int RESULT_OK = -1; // 0xffffffff

    field @FlaggedApi("android.companion.association_failure_code") public static final int RESULT_SECURITY_ERROR = 4; // 0x4

    field public static final int RESULT_SECURITY_ERROR = 4; // 0x4

    field public static final int RESULT_USER_REJECTED = 1; // 0x1

  }









@@ -10399,7 +10399,7 @@ package android.companion {













    method public void onAssociationPending(@NonNull android.content.IntentSender);















    method @Deprecated public void onDeviceFound(@NonNull android.content.IntentSender);















    method public abstract void onFailure(@Nullable CharSequence);













    method @FlaggedApi("android.companion.association_failure_code") public void onFailure(int, @Nullable CharSequence);













    method public void onFailure(int, @Nullable CharSequence);















  }





























  public abstract class CompanionDeviceService extends android.app.Service {









@@ -10408,10 +10408,10 @@ 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 @FlaggedApi("android.companion.device_presence") @MainThread public void onDeviceAppeared(@NonNull android.companion.AssociationInfo);













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















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













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













    method @FlaggedApi("android.companion.device_presence") @MainThread public void onDevicePresenceEvent(@NonNull android.companion.DevicePresenceEvent);













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













    method @MainThread public void onDevicePresenceEvent(@NonNull android.companion.DevicePresenceEvent);















    field public static final String SERVICE_INTERFACE = "android.companion.CompanionDeviceService";















  }
























@@ -10439,7 +10439,7 @@ package android.companion {













  public class DeviceNotAssociatedException extends java.lang.RuntimeException {















  }



























  @FlaggedApi("android.companion.device_presence") public final class DevicePresenceEvent implements android.os.Parcelable {













  public final class DevicePresenceEvent implements android.os.Parcelable {















    ctor public DevicePresenceEvent(int, int, @Nullable android.os.ParcelUuid);















    method public int describeContents();















    method public int getAssociationId();









@@ -10457,7 +10457,7 @@ package android.companion {













    field public static final int NO_ASSOCIATION = -1; // 0xffffffff















  }



























  @FlaggedApi("android.companion.device_presence") public final class ObservingDevicePresenceRequest implements android.os.Parcelable {













  public final class ObservingDevicePresenceRequest implements android.os.Parcelable {















    method public int describeContents();















    method public int getAssociationId();















    method @Nullable public android.os.ParcelUuid getUuid();

























core/api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -3444,7 +3444,7 @@ package android.companion {













    method public void onAssociationsChanged(@NonNull java.util.List<android.companion.AssociationInfo>);















  }



























  @FlaggedApi("android.companion.device_presence") public final class ObservingDevicePresenceRequest implements android.os.Parcelable {













  public final class ObservingDevicePresenceRequest implements android.os.Parcelable {















    method @FlaggedApi("android.companion.association_verification") @Nullable public android.companion.DeviceId getDeviceId();















  }







































core/api/test-current.txt



+2
−2




























Original line number
Diff line number
Diff line








@@ -922,7 +922,7 @@ package android.appwidget {





























package android.companion {





























  @FlaggedApi("android.companion.new_association_builder") public static final class AssociationInfo.Builder {













  public static final class AssociationInfo.Builder {















    ctor public AssociationInfo.Builder(int, int, @NonNull String);















    ctor public AssociationInfo.Builder(@NonNull android.companion.AssociationInfo);















    method @NonNull public android.companion.AssociationInfo build();









@@ -934,7 +934,7 @@ package android.companion {













    method @NonNull public android.companion.AssociationInfo.Builder setDisplayName(@Nullable CharSequence);















    method @NonNull public android.companion.AssociationInfo.Builder setLastTimeConnected(long);















    method @NonNull public android.companion.AssociationInfo.Builder setNotifyOnDeviceNearby(boolean);













    method @NonNull public android.companion.AssociationInfo.Builder setPackagesToNotify(@Nullable java.util.List<java.lang.String>);













    method @FlaggedApi("android.companion.association_verification") @NonNull public android.companion.AssociationInfo.Builder setPackagesToNotify(@Nullable java.util.List<java.lang.String>);















    method @NonNull public android.companion.AssociationInfo.Builder setRevoked(boolean);















    method @NonNull public android.companion.AssociationInfo.Builder setSelfManaged(boolean);















    method @NonNull public android.companion.AssociationInfo.Builder setSystemDataSyncFlags(int);

































core/java/android/companion/AssociationInfo.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -528,7 +528,6 @@ public final class AssociationInfo implements Parcelable {













     *















     * @hide















     */













    @FlaggedApi(Flags.FLAG_NEW_ASSOCIATION_BUILDER)















    @TestApi















    public static final class Builder {















        private final int mId;










@@ -721,6 +720,7 @@ public final class AssociationInfo implements Parcelable {













        @TestApi















        @NonNull















        @SuppressLint("MissingGetterMatchingBuilder")













        @SuppressWarnings("UnflaggedApi")















        public Builder setTransportFlags(int flags) {















            mTransportFlags = flags;















            return this;









@@ -740,6 +740,7 @@ public final class AssociationInfo implements Parcelable {













        @TestApi















        @NonNull















        @SuppressLint("MissingGetterMatchingBuilder")













        @FlaggedApi(Flags.FLAG_ASSOCIATION_VERIFICATION)















        public Builder setPackagesToNotify(@Nullable List<String> packagesToNotify) {















            mPackagesToNotify = packagesToNotify;















            return this;

































core/java/android/companion/CompanionDeviceManager.java



+1
−10




























Original line number
Diff line number
Diff line








@@ -162,7 +162,6 @@ public final class CompanionDeviceManager {













     * association due to the security issue.















     * E.g. There are missing necessary permissions when creating association.















     */













    @FlaggedApi(Flags.FLAG_ASSOCIATION_FAILURE_CODE)















    public static final int RESULT_SECURITY_ERROR = 4;































    /**










@@ -405,7 +404,6 @@ public final class CompanionDeviceManager {













         *                  could not be created.















         * @param error error message.















         */













        @FlaggedApi(Flags.FLAG_ASSOCIATION_FAILURE_CODE)















        public void onFailure(@ResultCode int errorCode, @Nullable CharSequence error) {}















    }


























@@ -1360,7 +1358,6 @@ public final class CompanionDeviceManager {













     * @deprecated use {@link #startObservingDevicePresence(ObservingDevicePresenceRequest)}















     * instead.















     */













    @FlaggedApi(Flags.FLAG_DEVICE_PRESENCE)















    @Deprecated















    @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE)















    public void startObservingDevicePresence(@NonNull String deviceAddress)










@@ -1409,7 +1406,6 @@ public final class CompanionDeviceManager {













     * @deprecated use {@link #stopObservingDevicePresence(ObservingDevicePresenceRequest)}















     * instead.















     */













    @FlaggedApi(Flags.FLAG_DEVICE_PRESENCE)















    @Deprecated















    @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE)















    public void stopObservingDevicePresence(@NonNull String deviceAddress)










@@ -1469,7 +1465,6 @@ public final class CompanionDeviceManager {













     * @see ObservingDevicePresenceRequest.Builder















     * @see CompanionDeviceService#onDevicePresenceEvent(DevicePresenceEvent)















     */













    @FlaggedApi(Flags.FLAG_DEVICE_PRESENCE)















    @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE)















    public void startObservingDevicePresence(@NonNull ObservingDevicePresenceRequest request) {















        if (mService == null) {









@@ -1495,7 +1490,6 @@ public final class CompanionDeviceManager {













     *















     * @param request A request for setting the types of device for observing device presence.















     */













    @FlaggedApi(Flags.FLAG_DEVICE_PRESENCE)















    @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE)















    public void stopObservingDevicePresence(@NonNull ObservingDevicePresenceRequest request) {















        if (mService == null) {










@@ -2002,10 +1996,7 @@ public final class CompanionDeviceManager {





























        @Override















        public void onFailure(@ResultCode int errorCode, @Nullable CharSequence error) {













            if (Flags.associationFailureCode()) {















            execute(mCallback::onFailure, errorCode, error);













            }





























            execute(mCallback::onFailure, error);















        }