From cf901d783982cbe4769eef55373a58f86098e651 Mon Sep 17 00:00:00 2001 From: Todd Kennedy Date: Tue, 16 May 2017 09:10:07 -0700 Subject: [PATCH] ignore IllegalArgumentException during uninstall It's expected and normal to throw an IllegalArgumentException when trying to uninstall a package that doesn't exist. Ignore it if it gets thrown. Bug: 38197362 Test: bit FrameworksCoreTests:android.content.pm.PackageManagerTests#testFlagFManifestI Change-Id: Ie0d90010678b09c91747f6e5c4655691951ad3a9 --- .../content/pm/PackageManagerTests.java | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/core/tests/coretests/src/android/content/pm/PackageManagerTests.java b/core/tests/coretests/src/android/content/pm/PackageManagerTests.java index 33a04939387ae..1ffc1b3b5abe1 100644 --- a/core/tests/coretests/src/android/content/pm/PackageManagerTests.java +++ b/core/tests/coretests/src/android/content/pm/PackageManagerTests.java @@ -1317,24 +1317,8 @@ public class PackageManagerTests extends AndroidTestCase { return; } Runtime.getRuntime().gc(); - - final String packageName = ip.pkg.packageName; - Log.i(TAG, "Deleting package : " + packageName); - - ApplicationInfo info = null; try { - info = getPm().getApplicationInfo(packageName, PackageManager.MATCH_UNINSTALLED_PACKAGES); - } catch (NameNotFoundException ignored) { - } - - DeleteObserver observer = new DeleteObserver(packageName); - getPm().deletePackage(packageName, observer, PackageManager.DELETE_ALL_USERS); - observer.waitForCompletion(MAX_WAIT_TIME); - - try { - if (info != null) { - assertUninstalled(info); - } + cleanUpInstall(ip.pkg.packageName); } finally { File outFile = new File(ip.pkg.codePath); if (outFile != null && outFile.exists()) { @@ -1349,16 +1333,15 @@ public class PackageManagerTests extends AndroidTestCase { } Log.i(TAG, "Deleting package : " + pkgName); try { - ApplicationInfo info = getPm().getApplicationInfo(pkgName, + final ApplicationInfo info = getPm().getApplicationInfo(pkgName, PackageManager.MATCH_UNINSTALLED_PACKAGES); - if (info != null) { DeleteObserver observer = new DeleteObserver(pkgName); getPm().deletePackage(pkgName, observer, PackageManager.DELETE_ALL_USERS); observer.waitForCompletion(MAX_WAIT_TIME); assertUninstalled(info); } - } catch (NameNotFoundException e) { + } catch (IllegalArgumentException | NameNotFoundException e) { } }