commit d1bca1e1047130520b52b671da20ef26ce111ea2
author Sihua Ma <sihua@google.com> Sat Feb 03 00:07:41 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Feb 03 00:07:41 2024 +0000
tree 015c9eb758c28a9e1aadac381148c7351c8fb19a
parent 398ef7996fb323353aef60acf1d0ea8b7f3ef373
parent 511e868a723c4322d1b4c66ea92ef91ddfdcdc91

Merge "Revert "Deprecate setRemoteAdapter that takes service intent"" into main

core/api/current.txt

diff --git a/core/api/current.txt b/core/api/current.txt
index a3775b0..e49fc28 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -59602,7 +59602,7 @@
     method public void setRadioGroupChecked(@IdRes int, @IdRes int);
     method public void setRelativeScrollPosition(@IdRes int, int);
     method @Deprecated public void setRemoteAdapter(int, @IdRes int, android.content.Intent);
-    method @Deprecated public void setRemoteAdapter(@IdRes int, android.content.Intent);
+    method public void setRemoteAdapter(@IdRes int, android.content.Intent);
     method public void setRemoteAdapter(@IdRes int, @NonNull android.widget.RemoteViews.RemoteCollectionItems);
     method public void setScrollPosition(@IdRes int, int);
     method public void setShort(@IdRes int, String, short);

core/java/android/widget/RemoteViews.java

diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java
index 2433bd8..738bb1f 100644
--- a/core/java/android/widget/RemoteViews.java
+++ b/core/java/android/widget/RemoteViews.java
@@ -5044,10 +5044,7 @@
      * @param viewId The id of the {@link AdapterView}
      * @param intent The intent of the service which will be
      *            providing data to the RemoteViewsAdapter
-     * @deprecated use
-     * {@link #setRemoteAdapter(int, android.widget.RemoteViews.RemoteCollectionItems)} instead
      */
-    @Deprecated
     public void setRemoteAdapter(@IdRes int viewId, Intent intent) {
         if (remoteAdapterConversion()) {
             addAction(new SetRemoteCollectionItemListAdapterAction(viewId, intent));