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

Commit a15d7a26 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Correct setting the RemoteView's provider id." into sc-dev am: 25ad0530 am: e21280df 

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

Change-Id: Ia96f9db60823158f8747a4ea7a65757afe33f8b9
parents dd9784bd e21280df

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

+2 −3
Original line number Diff line number Diff line
@@ -1839,8 +1839,6 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
                // For a full update we replace the RemoteViews completely.

                widget.views = views;

            }

            widget.views.setProviderInstanceId(UPDATE_COUNTER.get());



            int memoryUsage;

            if ((UserHandle.getAppId(Binder.getCallingUid()) != Process.SYSTEM_UID) &&

                    (widget.views != null) &&
@@ -1942,13 +1940,14 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
            return;

        }

        if (updateViews != null) {

            updateViews = new RemoteViews(updateViews);

            updateViews.setProviderInstanceId(requestId);

        }



        SomeArgs args = SomeArgs.obtain();

        args.arg1 = widget.host;

        args.arg2 = widget.host.callbacks;

        args.arg3 = (updateViews != null) ? updateViews.clone() : null;

        args.arg3 = updateViews;

        args.arg4 = requestId;

        args.argi1 = widget.appWidgetId;