From 511e868a723c4322d1b4c66ea92ef91ddfdcdc91 Mon Sep 17 00:00:00 2001 From: Sihua Ma Date: Fri, 12 Jan 2024 00:19:12 +0000 Subject: Revert "Deprecate setRemoteAdapter that takes service intent" This reverts commit 3cca6996a46b212d37295d46d824e32cf968124d. Reason for revert: Delay @Deprecated annotation Change-Id: Id009fd46ccbf7ad9336d6edab8e835f4e4065d08 --- core/api/current.txt | 2 +- core/java/android/widget/RemoteViews.java | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index a3775b05cf2e..e49fc2880758 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -59602,7 +59602,7 @@ package android.widget { 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); diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java index 2433bd865e73..738bb1f0006a 100644 --- a/core/java/android/widget/RemoteViews.java +++ b/core/java/android/widget/RemoteViews.java @@ -5044,10 +5044,7 @@ public class RemoteViews implements Parcelable, Filter { * @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)); -- cgit v1.2.3-59-g8ed1b