Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ee34965 authored by Sihua Ma's avatar Sihua Ma Committed by Android Build Coastguard Worker
Browse files

Revert "Deprecate setRemoteAdapter that takes service intent" 

This reverts commit 3cca6996.

Reason for revert: Delay @Deprecated annotation
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:511e868a723c4322d1b4c66ea92ef91ddfdcdc91)
Merged-In: Id009fd46ccbf7ad9336d6edab8e835f4e4065d08
Change-Id: Id009fd46ccbf7ad9336d6edab8e835f4e4065d08
parent 1fcd0c71

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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);

core/java/android/widget/RemoteViews.java

+0 −3
Original line number Diff line number Diff line
@@ -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));