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

Commit ef489b0f authored by Pinyao Ting's avatar Pinyao Ting Committed by Automerger Merge Worker
Browse files

Merge "Fix a security issue in app widget service." into qt-dev am: 5a292b8b... 

Merge "Fix a security issue in app widget service." into qt-dev am: 5a292b8b am: f90c7700 am: af809557 am: 1dd381ac

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



Change-Id: Id319d9e171c2b99335aa7c7ad845dfe6acc9a2a7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ddaa966c 1dd381ac

core/java/android/appwidget/AppWidgetManager.java

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

services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java

+4 −3
Original line number Diff line number Diff line
@@ -1202,8 +1202,9 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
                if (ActivityManager.getService().bindService(

                        caller, activtiyToken, intent,

                        intent.resolveTypeIfNeeded(mContext.getContentResolver()),

                        connection, flags, mContext.getOpPackageName(),

                        widget.provider.getUserId()) != 0) {

                        connection, flags & (Context.BIND_AUTO_CREATE

                                | Context.BIND_FOREGROUND_SERVICE_WHILE_AWAKE),

                        mContext.getOpPackageName(), widget.provider.getUserId()) != 0) {



                    // Add it to the mapping of RemoteViewsService to appWidgetIds so that we

                    // can determine when we can call back to the RemoteViewsService later to