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

Commit 1315b617 authored by Austin Borger's avatar Austin Borger
Browse files

De-deprecate AttributionSource.setNext 

AttributionSource.setNextAttributionSource will not be enabled in the
next release. AttributionSource.setNext can't be deprecated without a
replacement.

Bug: 310904873
Test: Built locally.
Change-Id: I78aa6865439ab7d51a9c5c4e4deec9636d56635c
parent a29375a5

core/api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -9851,7 +9851,7 @@ package android.content { 
    method @NonNull public android.content.AttributionSource build();

    method @NonNull public android.content.AttributionSource build();

    method @NonNull public android.content.AttributionSource.Builder setAttributionTag(@Nullable String);

    method @NonNull public android.content.AttributionSource.Builder setAttributionTag(@Nullable String);

    method @FlaggedApi("android.permission.flags.device_aware_permission_apis") @NonNull public android.content.AttributionSource.Builder setDeviceId(int);

    method @FlaggedApi("android.permission.flags.device_aware_permission_apis") @NonNull public android.content.AttributionSource.Builder setDeviceId(int);

    method @Deprecated @NonNull public android.content.AttributionSource.Builder setNext(@Nullable android.content.AttributionSource);

    method @NonNull public android.content.AttributionSource.Builder setNext(@Nullable android.content.AttributionSource);

    method @FlaggedApi("android.permission.flags.set_next_attribution_source") @NonNull public android.content.AttributionSource.Builder setNextAttributionSource(@NonNull android.content.AttributionSource);

    method @FlaggedApi("android.permission.flags.set_next_attribution_source") @NonNull public android.content.AttributionSource.Builder setNextAttributionSource(@NonNull android.content.AttributionSource);

    method @NonNull public android.content.AttributionSource.Builder setPackageName(@Nullable String);

    method @NonNull public android.content.AttributionSource.Builder setPackageName(@Nullable String);

    method @NonNull public android.content.AttributionSource.Builder setPid(int);

    method @NonNull public android.content.AttributionSource.Builder setPid(int);

core/java/android/content/AttributionSource.java

+0 −3
Original line number Original line Diff line number Diff line
@@ -730,10 +730,7 @@ public final class AttributionSource implements Parcelable { 




        /**

        /**

         * The next app to receive the permission protected data.

         * The next app to receive the permission protected data.

         *

         * @deprecated Use {@link #setNextAttributionSource} instead.

         */

         */

        @Deprecated

        public @NonNull Builder setNext(@Nullable AttributionSource value) {

        public @NonNull Builder setNext(@Nullable AttributionSource value) {

            checkNotUsed();

            checkNotUsed();

            mBuilderFieldsSet |= 0x20;

            mBuilderFieldsSet |= 0x20;