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

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

Merge "Add trunk stable flags for Association tag" into main

parents 04c8eb8b a4f33730

core/api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -9530,7 +9530,7 @@ package android.companion { 
    method @Nullable public CharSequence getDisplayName();

    method public int getId();

    method public int getSystemDataSyncFlags();

    method @Nullable public String getTag();

    method @FlaggedApi("android.companion.association_tag") @Nullable public String getTag();

    method public void writeToParcel(@NonNull android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.companion.AssociationInfo> CREATOR;

  }
@@ -9600,7 +9600,7 @@ package android.companion { 
    method @RequiresPermission(android.Manifest.permission.DELIVER_COMPANION_MESSAGES) public void attachSystemDataTransport(int, @NonNull java.io.InputStream, @NonNull java.io.OutputStream) throws android.companion.DeviceNotAssociatedException;

    method @Nullable public android.content.IntentSender buildAssociationCancellationIntent();

    method @Nullable public android.content.IntentSender buildPermissionTransferUserConsentIntent(int) throws android.companion.DeviceNotAssociatedException;

    method public void clearAssociationTag(int);

    method @FlaggedApi("android.companion.association_tag") public void clearAssociationTag(int);

    method @RequiresPermission(android.Manifest.permission.DELIVER_COMPANION_MESSAGES) public void detachSystemDataTransport(int) throws android.companion.DeviceNotAssociatedException;

    method public void disableSystemDataSyncForTypes(int, int);

    method @Deprecated public void disassociate(@NonNull String);
@@ -9610,7 +9610,7 @@ package android.companion { 
    method @NonNull public java.util.List<android.companion.AssociationInfo> getMyAssociations();

    method @Deprecated public boolean hasNotificationAccess(android.content.ComponentName);

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

    method public void setAssociationTag(int, @NonNull String);

    method @FlaggedApi("android.companion.association_tag") public void setAssociationTag(int, @NonNull String);

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

    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 @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) public void stopObservingDevicePresence(@NonNull String) throws android.companion.DeviceNotAssociatedException;

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -851,7 +851,7 @@ package android.companion { 
    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);

    method @NonNull public android.companion.AssociationInfo.Builder setTag(@Nullable String);

    method @FlaggedApi("android.companion.association_tag") @NonNull public android.companion.AssociationInfo.Builder setTag(@Nullable String);

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

  }

core/java/android/companion/AssociationInfo.java

+2 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ public final class AssociationInfo implements Parcelable { 
     * @return the tag of this association.

     * @see CompanionDeviceManager#setAssociationTag(int, String)

     */

    @FlaggedApi(Flags.FLAG_ASSOCIATION_TAG)

    @Nullable

    public String getTag() {

        return mTag;
@@ -459,6 +460,7 @@ public final class AssociationInfo implements Parcelable { 
        }



        /** @hide */

        @FlaggedApi(Flags.FLAG_ASSOCIATION_TAG)

        @TestApi

        @NonNull

        public Builder setTag(@Nullable String tag) {

core/java/android/companion/CompanionDeviceManager.java

+2 −0
Original line number Diff line number Diff line
@@ -1435,6 +1435,7 @@ public final class CompanionDeviceManager { 
     *                          of the companion device recorded by CompanionDeviceManager

     * @param tag the tag of this association

     */

    @FlaggedApi(Flags.FLAG_ASSOCIATION_TAG)

    @UserHandleAware

    public void setAssociationTag(int associationId, @NonNull String tag) {

        Objects.requireNonNull(tag, "tag cannot be null");
@@ -1459,6 +1460,7 @@ public final class CompanionDeviceManager { 
     *                          of the companion device recorded by CompanionDeviceManager

     * @see CompanionDeviceManager#setAssociationTag(int, String)

     */

    @FlaggedApi(Flags.FLAG_ASSOCIATION_TAG)

    @UserHandleAware

    public void clearAssociationTag(int associationId) {

        try {

core/java/android/companion/flags.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -13,3 +13,10 @@ flag { 
    description: "Grants access to the companion transport apis."

    bug: "288297505"

}



flag {

    name: "association_tag"

    namespace: "companion"

    description: "Enable Association tag APIs "

    bug: "289241123"

}
 
 No newline at end of file