commit 54cc66e8accde809fa21303f7856cdc7794837cb
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Nov 13 01:10:07 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 13 01:10:07 2024 +0000
tree c1bc58d32ed3e031d5c7e9ca799bf32a56eb685e
parent a2d96cc0e4bfff9fde4ba771affc8e54fc2c0a28
parent f2a15524e4f56a39ecbc68dc4835305bcdad2a1e

Merge "Address uses of USER_SYSTEM in AppWidgetService." into main

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

diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
index b221d74..827e3ef 100644
--- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
+++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
@@ -607,7 +607,8 @@
                     // ... and see if these are hosts we've been awaiting.
                     // NOTE: We are backing up and restoring only the owner.
                     // TODO: http://b/22388012
-                    if (newPackageAdded && userId == UserHandle.USER_SYSTEM) {
+                    UserHandle mainUser = mUserManager.getMainUser();
+                    if (newPackageAdded && mainUser != null && userId == mainUser.getIdentifier()) {
                         final int uid = getUidForPackage(pkgName, userId);
                         if (uid >= 0 ) {
                             resolveHostUidLocked(pkgName, uid);