Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Idb4043de6c831a5aebd33e75af59598fe0ecb8d1
This commit is contained in:
TreeHugger Robot
2021-05-17 19:22:18 +00:00
committed by Automerger Merge Worker
parent 0edd256051 25ad053080
commit e21280df31
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
View File

@@ -1839,8 +1839,6 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
// For a full update we replace the RemoteViews completely. // For a full update we replace the RemoteViews completely.
widget.views = views; widget.views = views;
} }
widget.views.setProviderInstanceId(UPDATE_COUNTER.get());
int memoryUsage; int memoryUsage;
if ((UserHandle.getAppId(Binder.getCallingUid()) != Process.SYSTEM_UID) && if ((UserHandle.getAppId(Binder.getCallingUid()) != Process.SYSTEM_UID) &&
(widget.views != null) && (widget.views != null) &&
@@ -1942,13 +1940,14 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
return; return;
} }
if (updateViews != null) { if (updateViews != null) {
updateViews = new RemoteViews(updateViews);
updateViews.setProviderInstanceId(requestId); updateViews.setProviderInstanceId(requestId);
} }
SomeArgs args = SomeArgs.obtain(); SomeArgs args = SomeArgs.obtain();
args.arg1 = widget.host; args.arg1 = widget.host;
args.arg2 = widget.host.callbacks; args.arg2 = widget.host.callbacks;
args.arg3 = (updateViews != null) ? updateViews.clone() : null; args.arg3 = updateViews;
args.arg4 = requestId; args.arg4 = requestId;
args.argi1 = widget.appWidgetId; args.argi1 = widget.appWidgetId;