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

Commit c0ab6713 authored by Sergey Nikolaienkov's avatar Sergey Nikolaienkov
Browse files

Rename CDM's Association class AssociationInfo 

First step in making the Association(Info) class a part of the public
API surface.

Bug: 194301022
Test: make
Change-Id: Ib1544ef7da471ae9fee1b9a9fabb01653454e277
parent a7e52432

core/java/android/companion/Association.aidl→core/java/android/companion/AssociationInfo.aidl

+1 −1
Original line number Diff line number Diff line
@@ -15,4 +15,4 @@ 
 */

package android.companion;



parcelable Association;
 
parcelable AssociationInfo;

core/java/android/companion/Association.java→core/java/android/companion/AssociationInfo.java

+11 −11
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import java.util.Set; 
 * TODO(b/1979395): un-hide and rename to AssociationInfo when implementing public APIs that use

 *                  this class.

 */

public final class Association implements Parcelable {

public final class AssociationInfo implements Parcelable {

    /**

     * A unique ID of this Association record.

     * Disclosed to the clients (ie. companion applications) for referring to this record (eg. in
@@ -63,7 +63,7 @@ public final class Association implements Parcelable { 
     *

     * @hide

     */

    public Association(int associationId, @UserIdInt int userId, @NonNull String packageName,

    public AssociationInfo(int associationId, @UserIdInt int userId, @NonNull String packageName,

            @NonNull List<DeviceId> deviceIds, @Nullable String deviceProfile,

            boolean managedByCompanionApp, boolean notifyOnDeviceNearby, long timeApprovedMs) {

        if (associationId <= 0) {
@@ -178,8 +178,8 @@ public final class Association implements Parcelable { 
    @Override

    public boolean equals(Object o) {

        if (this == o) return true;

        if (!(o instanceof Association)) return false;

        final Association that = (Association) o;

        if (!(o instanceof AssociationInfo)) return false;

        final AssociationInfo that = (AssociationInfo) o;

        return mAssociationId == that.mAssociationId

                && mUserId == that.mUserId

                && mManagedByCompanionApp == that.mManagedByCompanionApp
@@ -216,7 +216,7 @@ public final class Association implements Parcelable { 
        dest.writeLong(mTimeApprovedMs);

    }



    private Association(@NonNull Parcel in) {

    private AssociationInfo(@NonNull Parcel in) {

        mAssociationId = in.readInt();



        mUserId = in.readInt();
@@ -230,16 +230,16 @@ public final class Association implements Parcelable { 
        mTimeApprovedMs = in.readLong();

    }



    public static final Parcelable.Creator<Association> CREATOR =

            new Parcelable.Creator<Association>() {

    public static final Parcelable.Creator<AssociationInfo> CREATOR =

            new Parcelable.Creator<AssociationInfo>() {

        @Override

        public Association[] newArray(int size) {

            return new Association[size];

        public AssociationInfo[] newArray(int size) {

            return new AssociationInfo[size];

        }



        @Override

        public Association createFromParcel(@NonNull Parcel in) {

            return new Association(in);

        public AssociationInfo createFromParcel(@NonNull Parcel in) {

            return new AssociationInfo(in);

        }

    };

core/java/android/companion/CompanionDeviceManager.java

+2 −2
Original line number Diff line number Diff line
@@ -319,13 +319,13 @@ public final class CompanionDeviceManager { 
    }



    /**

     * Gets all package-device {@link Association}s for the current user.

     * Gets all package-device {@link AssociationInfo}s for the current user.

     *

     * @return the associations list

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.MANAGE_COMPANION_DEVICES)

    public @NonNull List<Association> getAllAssociations() {

    public @NonNull List<AssociationInfo> getAllAssociations() {

        if (!checkFeaturePresent()) {

            return Collections.emptyList();

        }

core/java/android/companion/ICompanionDeviceManager.aidl

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package android.companion; 


import android.app.PendingIntent;

import android.companion.IFindDeviceCallback;

import android.companion.Association;

import android.companion.AssociationInfo;

import android.companion.AssociationRequest;

import android.content.ComponentName;
@@ -36,7 +36,7 @@ interface ICompanionDeviceManager { 
        in String callingPackage);



    List<String> getAssociations(String callingPackage, int userId);

    List<Association> getAssociationsForUser(int userId);

    List<AssociationInfo> getAssociationsForUser(int userId);



    void disassociate(String deviceMacAddress, String callingPackage);

services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import static java.util.Collections.unmodifiableMap; 
import android.Manifest;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.companion.Association;

import android.companion.AssociationInfo;

import android.companion.AssociationRequest;

import android.companion.CompanionDeviceManager;

import android.companion.ICompanionDeviceDiscoveryService;
@@ -226,7 +226,7 @@ class AssociationRequestsProcessor { 


        // Throttle frequent associations

        long now = System.currentTimeMillis();

        Set<Association> recentAssociations = filter(

        Set<AssociationInfo> recentAssociations = filter(

                mService.getAllAssociations(userId, packageName),

                a -> now - a.getTimeApprovedMs() < ASSOCIATE_WITHOUT_PROMPT_WINDOW_MS);