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

Commit 8cd1b965 authored by Eugene Susla's avatar Eugene Susla Committed by Android (Google) Code Review
Browse files

Merge "Add creation time to CDM AssociationRequest" into sc-dev

parents 01e0568c 689af3ec

core/java/android/companion/AssociationRequest.java

+39 −8
Original line number Diff line number Diff line
@@ -113,6 +113,17 @@ public final class AssociationRequest implements Parcelable { 
     */

    private @Nullable String mDeviceProfilePrivilegesDescription = null;



    /**

     * The time at which his request was created

     *

     * @hide

     */

    private long mCreationTime;



    private void onConstructed() {

        mCreationTime = System.currentTimeMillis();

    }



    /** @hide */

    public void setCallingPackage(@NonNull String pkg) {

        mCallingPackage = pkg;
@@ -193,7 +204,7 @@ public final class AssociationRequest implements Parcelable { 
            markUsed();

            return new AssociationRequest(

                    mSingleDevice, emptyIfNull(mDeviceFilters),

                    mDeviceProfile, null, null);

                    mDeviceProfile, null, null, -1L);

        }

    }
@@ -234,6 +245,8 @@ public final class AssociationRequest implements Parcelable { 
     *   The user-readable description of the device profile's privileges.

     *

     *   Populated by the system.

     * @param creationTime

     *   The time at which his request was created

     * @hide

     */

    @DataClass.Generated.Member
@@ -242,7 +255,8 @@ public final class AssociationRequest implements Parcelable { 
            @NonNull List<DeviceFilter<?>> deviceFilters,

            @Nullable @DeviceProfile String deviceProfile,

            @Nullable String callingPackage,

            @Nullable String deviceProfilePrivilegesDescription) {

            @Nullable String deviceProfilePrivilegesDescription,

            long creationTime) {

        this.mSingleDevice = singleDevice;

        this.mDeviceFilters = deviceFilters;

        com.android.internal.util.AnnotationValidations.validate(
@@ -252,8 +266,9 @@ public final class AssociationRequest implements Parcelable { 
                DeviceProfile.class, null, mDeviceProfile);

        this.mCallingPackage = callingPackage;

        this.mDeviceProfilePrivilegesDescription = deviceProfilePrivilegesDescription;

        this.mCreationTime = creationTime;



        // onConstructed(); // You can define this method to get a callback

        onConstructed();

    }



    /**
@@ -290,6 +305,16 @@ public final class AssociationRequest implements Parcelable { 
        return mDeviceProfilePrivilegesDescription;

    }



    /**

     * The time at which his request was created

     *

     * @hide

     */

    @DataClass.Generated.Member

    public long getCreationTime() {

        return mCreationTime;

    }



    @Override

    @DataClass.Generated.Member

    public String toString() {
@@ -301,7 +326,8 @@ public final class AssociationRequest implements Parcelable { 
                "deviceFilters = " + mDeviceFilters + ", " +

                "deviceProfile = " + mDeviceProfile + ", " +

                "callingPackage = " + mCallingPackage + ", " +

                "deviceProfilePrivilegesDescription = " + mDeviceProfilePrivilegesDescription +

                "deviceProfilePrivilegesDescription = " + mDeviceProfilePrivilegesDescription + ", " +

                "creationTime = " + mCreationTime +

        " }";

    }
@@ -322,7 +348,8 @@ public final class AssociationRequest implements Parcelable { 
                && Objects.equals(mDeviceFilters, that.mDeviceFilters)

                && Objects.equals(mDeviceProfile, that.mDeviceProfile)

                && Objects.equals(mCallingPackage, that.mCallingPackage)

                && Objects.equals(mDeviceProfilePrivilegesDescription, that.mDeviceProfilePrivilegesDescription);

                && Objects.equals(mDeviceProfilePrivilegesDescription, that.mDeviceProfilePrivilegesDescription)

                && mCreationTime == that.mCreationTime;

    }



    @Override
@@ -337,6 +364,7 @@ public final class AssociationRequest implements Parcelable { 
        _hash = 31 * _hash + Objects.hashCode(mDeviceProfile);

        _hash = 31 * _hash + Objects.hashCode(mCallingPackage);

        _hash = 31 * _hash + Objects.hashCode(mDeviceProfilePrivilegesDescription);

        _hash = 31 * _hash + Long.hashCode(mCreationTime);

        return _hash;

    }
@@ -356,6 +384,7 @@ public final class AssociationRequest implements Parcelable { 
        if (mDeviceProfile != null) dest.writeString(mDeviceProfile);

        if (mCallingPackage != null) dest.writeString(mCallingPackage);

        if (mDeviceProfilePrivilegesDescription != null) dest.writeString(mDeviceProfilePrivilegesDescription);

        dest.writeLong(mCreationTime);

    }



    @Override
@@ -376,6 +405,7 @@ public final class AssociationRequest implements Parcelable { 
        String deviceProfile = (flg & 0x4) == 0 ? null : in.readString();

        String callingPackage = (flg & 0x8) == 0 ? null : in.readString();

        String deviceProfilePrivilegesDescription = (flg & 0x10) == 0 ? null : in.readString();

        long creationTime = in.readLong();



        this.mSingleDevice = singleDevice;

        this.mDeviceFilters = deviceFilters;
@@ -386,8 +416,9 @@ public final class AssociationRequest implements Parcelable { 
                DeviceProfile.class, null, mDeviceProfile);

        this.mCallingPackage = callingPackage;

        this.mDeviceProfilePrivilegesDescription = deviceProfilePrivilegesDescription;

        this.mCreationTime = creationTime;



        // onConstructed(); // You can define this method to get a callback

        onConstructed();

    }



    @DataClass.Generated.Member
@@ -405,10 +436,10 @@ public final class AssociationRequest implements Parcelable { 
    };



    @DataClass.Generated(

            time = 1611692924843L,

            time = 1614976943652L,

            codegenVersion = "1.0.22",

            sourceFile = "frameworks/base/core/java/android/companion/AssociationRequest.java",

            inputSignatures = "private static final  java.lang.String LOG_TAG\npublic static final  java.lang.String DEVICE_PROFILE_WATCH\nprivate  boolean mSingleDevice\nprivate @com.android.internal.util.DataClass.PluralOf(\"deviceFilter\") @android.annotation.NonNull java.util.List<android.companion.DeviceFilter<?>> mDeviceFilters\nprivate @android.annotation.Nullable @android.companion.AssociationRequest.DeviceProfile java.lang.String mDeviceProfile\nprivate @android.annotation.Nullable java.lang.String mCallingPackage\nprivate @android.annotation.Nullable java.lang.String mDeviceProfilePrivilegesDescription\npublic  void setCallingPackage(java.lang.String)\npublic  void setDeviceProfilePrivilegesDescription(java.lang.String)\npublic @android.compat.annotation.UnsupportedAppUsage boolean isSingleDevice()\npublic @android.annotation.NonNull @android.compat.annotation.UnsupportedAppUsage java.util.List<android.companion.DeviceFilter<?>> getDeviceFilters()\nclass AssociationRequest extends java.lang.Object implements [android.os.Parcelable]\nprivate  boolean mSingleDevice\nprivate @android.annotation.Nullable java.util.ArrayList<android.companion.DeviceFilter<?>> mDeviceFilters\nprivate @android.annotation.Nullable java.lang.String mDeviceProfile\npublic @android.annotation.NonNull android.companion.AssociationRequest.Builder setSingleDevice(boolean)\npublic @android.annotation.NonNull android.companion.AssociationRequest.Builder addDeviceFilter(android.companion.DeviceFilter<?>)\npublic @android.annotation.NonNull android.companion.AssociationRequest.Builder setDeviceProfile(java.lang.String)\npublic @android.annotation.NonNull @java.lang.Override android.companion.AssociationRequest build()\nclass Builder extends android.provider.OneTimeUseBuilder<android.companion.AssociationRequest> implements []\n@com.android.internal.util.DataClass(genToString=true, genEqualsHashCode=true, genHiddenGetters=true, genParcelable=true, genHiddenConstructor=true, genBuilder=false)")

            inputSignatures = "private static final  java.lang.String LOG_TAG\npublic static final  java.lang.String DEVICE_PROFILE_WATCH\nprivate  boolean mSingleDevice\nprivate @com.android.internal.util.DataClass.PluralOf(\"deviceFilter\") @android.annotation.NonNull java.util.List<android.companion.DeviceFilter<?>> mDeviceFilters\nprivate @android.annotation.Nullable @android.companion.AssociationRequest.DeviceProfile java.lang.String mDeviceProfile\nprivate @android.annotation.Nullable java.lang.String mCallingPackage\nprivate @android.annotation.Nullable java.lang.String mDeviceProfilePrivilegesDescription\nprivate  long mCreationTime\nprivate  void onConstructed()\npublic  void setCallingPackage(java.lang.String)\npublic  void setDeviceProfilePrivilegesDescription(java.lang.String)\npublic @android.compat.annotation.UnsupportedAppUsage boolean isSingleDevice()\npublic @android.annotation.NonNull @android.compat.annotation.UnsupportedAppUsage java.util.List<android.companion.DeviceFilter<?>> getDeviceFilters()\nclass AssociationRequest extends java.lang.Object implements [android.os.Parcelable]\nprivate  boolean mSingleDevice\nprivate @android.annotation.Nullable java.util.ArrayList<android.companion.DeviceFilter<?>> mDeviceFilters\nprivate @android.annotation.Nullable java.lang.String mDeviceProfile\npublic @android.annotation.NonNull android.companion.AssociationRequest.Builder setSingleDevice(boolean)\npublic @android.annotation.NonNull android.companion.AssociationRequest.Builder addDeviceFilter(android.companion.DeviceFilter<?>)\npublic @android.annotation.NonNull android.companion.AssociationRequest.Builder setDeviceProfile(java.lang.String)\npublic @android.annotation.NonNull @java.lang.Override android.companion.AssociationRequest build()\nclass Builder extends android.provider.OneTimeUseBuilder<android.companion.AssociationRequest> implements []\n@com.android.internal.util.DataClass(genToString=true, genEqualsHashCode=true, genHiddenGetters=true, genParcelable=true, genHiddenConstructor=true, genBuilder=false)")

    @Deprecated

    private void __metadata() {}