summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorPinyao Ting <pinyaoting@google.com>2022-09-23 23:40:28 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-09-23 23:40:28 +0000
commitaa157b377d6be726805eec4d0e331b143d30d2ca (patch)
treeaedf87a22a8911a6dc5b3fe5231d0a4a7bf63da6 /core/java/android
parentbe4bddc7da226e6444b184257f62c6f065d3b940 (diff)
parentc6cd57ed1b5b4ecb1d68e6c53ef374f38605d15f (diff)
Merge "Fix a security issue in app widget service." into qt-dev am: 5a292b8bf4 am: f90c770087 am: af809557f8 am: 1dd381ac4a am: ef489b0fec am: e6d0a468f9 am: c6cd57ed1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20026360 Change-Id: I7d41f191740509f96f94db579c187d6095872f0c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/appwidget/AppWidgetManager.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/appwidget/AppWidgetManager.java b/core/java/android/appwidget/AppWidgetManager.java
index 18c638112480..a432b8dec2cb 100644
--- a/core/java/android/appwidget/AppWidgetManager.java
+++ b/core/java/android/appwidget/AppWidgetManager.java
@@ -1130,7 +1130,9 @@ public class AppWidgetManager {
* @param intent The intent of the service which will be providing the data to the
* RemoteViewsAdapter.
* @param connection The callback interface to be notified when a connection is made or lost.
- * @param flags Flags used for binding to the service
+ * @param flags Flags used for binding to the service. Currently only
+ * {@link Context#BIND_AUTO_CREATE} and
+ * {@link Context#BIND_FOREGROUND_SERVICE_WHILE_AWAKE} are supported.
*
* @see Context#getServiceDispatcher(ServiceConnection, Handler, int)
* @hide