OSDN Git Service

Handle null user in deletePackageLIF
authorAmith Yamasani <yamasani@google.com>
Fri, 23 Mar 2018 15:44:05 +0000 (08:44 -0700)
committerAmith Yamasani <yamasani@google.com>
Fri, 23 Mar 2018 17:09:49 +0000 (10:09 -0700)
Assume null is USER_ALL for checking suspending apps.

Bug: 76170601
Test: atest InstallSessionParamsUnitTest
Change-Id: Idf804dcdd7fe8c8fa02ea5eef524dc1ecd1ad6e1

services/core/java/com/android/server/pm/PackageManagerService.java

index 576d228..0300548 100644 (file)
@@ -18688,9 +18688,10 @@ public class PackageManagerService extends IPackageManager.Stub
                 return true;
             }
         }
-        if (ps.getPermissionsState().hasPermission(
-                Manifest.permission.SUSPEND_APPS, user.getIdentifier())) {
-            onSuspendingPackageRemoved(packageName, user.getIdentifier());
+
+        final int userId = user == null ? UserHandle.USER_ALL : user.getIdentifier();
+        if (ps.getPermissionsState().hasPermission(Manifest.permission.SUSPEND_APPS, userId)) {
+            onSuspendingPackageRemoved(packageName, userId);
         }