commit 6413fe4acd205d6f0839803adf32fb074be579dc
author Austin Borger <borgera@google.com> Tue Nov 28 21:43:52 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 28 21:43:52 2023 +0000
tree 4940048882f3d30271fa31ce24f016ccc86a6d82
parent b8d0e8573fdc860dc0f4d5cc847063989bbe559e
parent 1315b617340cb59dc61556ad244e3a0eb28759c1

Merge "De-deprecate AttributionSource.setNext" into main

core/api/current.txt

diff --git a/core/api/current.txt b/core/api/current.txt
index 3091354..a525863 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -9854,7 +9854,7 @@
     method @NonNull public android.content.AttributionSource build();
     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 @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 @NonNull public android.content.AttributionSource.Builder setPackageName(@Nullable String);
     method @NonNull public android.content.AttributionSource.Builder setPid(int);

core/java/android/content/AttributionSource.java

diff --git a/core/java/android/content/AttributionSource.java b/core/java/android/content/AttributionSource.java
index 4b2cee6..697c25c 100644
--- a/core/java/android/content/AttributionSource.java
+++ b/core/java/android/content/AttributionSource.java
@@ -730,10 +730,7 @@
 
         /**
          * The next app to receive the permission protected data.
-         *
-         * @deprecated Use {@link #setNextAttributionSource} instead.
          */
-        @Deprecated
         public @NonNull Builder setNext(@Nullable AttributionSource value) {
             checkNotUsed();
             mBuilderFieldsSet |= 0x20;