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

Merge "Return widget uid only when it is bound to screen" into tm-qpr-dev am: 731c7bb7b5

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

Change-Id: I5f4b1866ebaf3c089001e65cfc92b5d47ed12a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-01-11 02:12:00 +00:00
committed by Automerger Merge Worker
parent a6dc2c7694 731c7bb7b5
commit 417d9b1e7d
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -817,7 +817,8 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
if (host != null) { if (host != null) {
host.callbacks = null; host.callbacks = null;
pruneHostLocked(host); pruneHostLocked(host);
mAppOpsManagerInternal.updateAppWidgetVisibility(host.getWidgetUids(), false); mAppOpsManagerInternal.updateAppWidgetVisibility(host.getWidgetUidsIfBound(),
false);
} }
} }
} }
@@ -888,12 +889,8 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
Host host = lookupHostLocked(id); Host host = lookupHostLocked(id);
if (host != null) { if (host != null) {
try { mAppOpsManagerInternal.updateAppWidgetVisibility(host.getWidgetUidsIfBound(),
mAppOpsManagerInternal.updateAppWidgetVisibility(host.getWidgetUids(), false); false);
} catch (NullPointerException e) {
Slog.e(TAG, "setAppWidgetHidden(): Getting host uids: " + host.toString(), e);
throw e;
}
} }
} }
} }
@@ -4345,14 +4342,15 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
PendingHostUpdate.appWidgetRemoved(appWidgetId)); PendingHostUpdate.appWidgetRemoved(appWidgetId));
} }
public SparseArray<String> getWidgetUids() { public SparseArray<String> getWidgetUidsIfBound() {
final SparseArray<String> uids = new SparseArray<>(); final SparseArray<String> uids = new SparseArray<>();
for (int i = widgets.size() - 1; i >= 0; i--) { for (int i = widgets.size() - 1; i >= 0; i--) {
final Widget widget = widgets.get(i); final Widget widget = widgets.get(i);
if (widget.provider == null) { if (widget.provider == null) {
if (DEBUG) { if (DEBUG) {
Slog.e(TAG, "Widget with no provider " + widget.toString()); Slog.d(TAG, "Widget with no provider " + widget.toString());
} }
continue;
} }
final ProviderId providerId = widget.provider.id; final ProviderId providerId = widget.provider.id;
uids.put(providerId.uid, providerId.componentName.getPackageName()); uids.put(providerId.uid, providerId.componentName.getPackageName());