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

Commit dfba04e2 authored by Guojing Yuan's avatar Guojing Yuan Committed by Android (Google) Code Review
Browse files

Merge "[CDM] Expose isSelfManaged to public" into main

parents 8cb8a3ea 28e8f1bc

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9533,6 +9533,7 @@ package android.companion { 
    method public int getId();

    method public int getSystemDataSyncFlags();

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

    method public boolean isSelfManaged();

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

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

  }

core/api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -3149,7 +3149,6 @@ package android.companion { 














  public final class AssociationInfo implements android.os.Parcelable {















    method @NonNull public String getPackageName();













    method public boolean isSelfManaged();















  }





























  public final class CompanionDeviceManager {

























core/java/android/companion/AssociationInfo.java



+1
−2




























Original line number
Diff line number
Diff line








@@ -206,9 +206,8 @@ public final class AssociationInfo implements Parcelable {













    /**















     * @return whether the association is managed by the companion application it belongs to.















     * @see AssociationRequest.Builder#setSelfManaged(boolean)













     * @hide















     */













    @SystemApi













    @SuppressLint("UnflaggedApi") // promoting from @SystemApi















    public boolean isSelfManaged() {















        return mSelfManaged;















    }