diff options
| author | Sihua Ma <sihua@google.com> | 2024-01-12 00:19:12 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-06 21:14:17 +0000 |
| commit | 6ee349657118ba1a3a9c21b6aeae77335f420b30 (patch) | |
| tree | 647f908d122ec464fbadee34ba05b55d54dc37fd | |
| parent | 1fcd0c7132d836c6ab5aaee5a0f834810beff4ee (diff) | |
| download | base-6ee349657118ba1a3a9c21b6aeae77335f420b30.tar.gz | |
Revert "Deprecate setRemoteAdapter that takes service intent"
This reverts commit 3cca6996a46b212d37295d46d824e32cf968124d.
Reason for revert: Delay @Deprecated annotation
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:511e868a723c4322d1b4c66ea92ef91ddfdcdc91)
Merged-In: Id009fd46ccbf7ad9336d6edab8e835f4e4065d08
Change-Id: Id009fd46ccbf7ad9336d6edab8e835f4e4065d08
| -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 690e023b225f..9b5316fb79b5 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -59609,7 +59609,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 8ad10af7250a..0dd12bae4664 100644 --- a/core/java/android/widget/RemoteViews.java +++ b/core/java/android/widget/RemoteViews.java @@ -4944,10 +4944,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)); |