diff options
| author | 2024-02-03 00:07:41 +0000 | |
|---|---|---|
| committer | 2024-02-03 00:07:41 +0000 | |
| commit | d1bca1e1047130520b52b671da20ef26ce111ea2 (patch) | |
| tree | 015c9eb758c28a9e1aadac381148c7351c8fb19a | |
| parent | 398ef7996fb323353aef60acf1d0ea8b7f3ef373 (diff) | |
| parent | 511e868a723c4322d1b4c66ea92ef91ddfdcdc91 (diff) | |
Merge "Revert "Deprecate setRemoteAdapter that takes service intent"" into main
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/widget/RemoteViews.java | 3 |
2 files changed, 1 insertions, 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)); |