summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-08-09 23:43:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-09 23:43:54 +0000
commit89ef5a7edea3602cd80dcc3204bfa88dca53b2b3 (patch)
tree93c36cb3b26507d75c938dfa06e982c803de4b8a
parent0c61e8c0e4af35c673175df1c523f04b3c7ec306 (diff)
parentfaf6220ce5de883612f34def6119ad1fcbd7258a (diff)
Merge "Modify meta parameters for remote adapter conversion" into udc-qpr-dev am: faf6220ce5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24359273 Change-Id: I8fdec4fe5aaebd8d893c63f12b0c2eee9ced4d7b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/widget/RemoteViews.java2
-rw-r--r--core/java/android/widget/RemoteViewsService.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java
index a2f95fa9df45..2ec38186f6e9 100644
--- a/core/java/android/widget/RemoteViews.java
+++ b/core/java/android/widget/RemoteViews.java
@@ -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.
diff --git a/core/java/android/widget/RemoteViewsService.java b/core/java/android/widget/RemoteViewsService.java
index d4f4d19e9bad..a250a867b9de 100644
--- a/core/java/android/widget/RemoteViewsService.java
+++ b/core/java/android/widget/RemoteViewsService.java
@@ -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