From 62b193ca956908a1f9d07625cbabcf14c9068b8d Mon Sep 17 00:00:00 2001 From: Alex Buynytskyy Date: Thu, 20 Jan 2022 15:46:55 -0800 Subject: [PATCH] Don't remove temporary missing package's user data. If a package was installed on SD card, we don't want to remove it's user data when SD card is removed. Bug: 211944048 Test: presubmit Change-Id: I440906ccb9ce8b3e510a25c6c2f51bff1e001658 --- .../core/java/com/android/server/pm/AppDataHelper.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/services/core/java/com/android/server/pm/AppDataHelper.java b/services/core/java/com/android/server/pm/AppDataHelper.java index a66af3cf7603d..bdb48bdbf6d9a 100644 --- a/services/core/java/com/android/server/pm/AppDataHelper.java +++ b/services/core/java/com/android/server/pm/AppDataHelper.java @@ -476,13 +476,9 @@ final class AppDataHelper { } else if (!ps.getInstalled(userId)) { throw new PackageManagerException( "Package " + packageName + " not installed for user " + userId); - } else if (ps.getPkg() == null) { - throw new PackageManagerException("Package " + packageName + " is not parsed yet"); - } else { - if (!shouldHaveAppStorage(ps.getPkg())) { - throw new PackageManagerException( - "Package " + packageName + " shouldn't have storage"); - } + } else if (ps.getPkg() != null && !shouldHaveAppStorage(ps.getPkg())) { + throw new PackageManagerException( + "Package " + packageName + " shouldn't have storage"); } } }