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

Commit 95febe84 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Modify meta parameters for remote adapter conversion" into udc-qpr-dev... 

Merge "Modify meta parameters for remote adapter conversion" into udc-qpr-dev am: faf6220c am: 89ef5a7e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24359273



Change-Id: I8d1165ac65de534ca21f072f2d90aeabf84058ce
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3fa633bb 89ef5a7e

core/java/android/widget/RemoteViews.java

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ public class RemoteViews implements Parcelable, Filter { 
     *

     * @hide

     */

    private static final int MAX_ADAPTER_CONVERSION_WAITING_TIME_MS = 2000;

    private static final int MAX_ADAPTER_CONVERSION_WAITING_TIME_MS = 5000;



    /**

     * Application that hosts the remote views.

core/java/android/widget/RemoteViewsService.java

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ public abstract class RemoteViewsService extends Service { 
     *

     * @hide

     */

    private static final int MAX_NUM_ENTRY = 25;

    private static final int MAX_NUM_ENTRY = 10;



    /**

     * An interface for an adapter between a remote collection view (ListView, GridView, etc) and