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

Merge "ignore IllegalArgumentException during uninstall" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-16 18:26:14 +00:00
committed by Android (Google) Code Review
parent a0bb98f989 cf901d7839
commit 8b540dc7aa
1 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/tests/coretests/src/android/content/pm/PackageManagerTests.java
View File

@@ -1317,24 +1317,8 @@ public class PackageManagerTests extends AndroidTestCase {
return; return;
} }
Runtime.getRuntime().gc(); Runtime.getRuntime().gc();
final String packageName = ip.pkg.packageName;
Log.i(TAG, "Deleting package : " + packageName);
ApplicationInfo info = null;
try { try {
info = getPm().getApplicationInfo(packageName, PackageManager.MATCH_UNINSTALLED_PACKAGES); cleanUpInstall(ip.pkg.packageName);
} 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);
}
} finally { } finally {
File outFile = new File(ip.pkg.codePath); File outFile = new File(ip.pkg.codePath);
if (outFile != null && outFile.exists()) { if (outFile != null && outFile.exists()) {
@@ -1349,16 +1333,15 @@ public class PackageManagerTests extends AndroidTestCase {
} }
Log.i(TAG, "Deleting package : " + pkgName); Log.i(TAG, "Deleting package : " + pkgName);
try { try {
ApplicationInfo info = getPm().getApplicationInfo(pkgName, final ApplicationInfo info = getPm().getApplicationInfo(pkgName,
PackageManager.MATCH_UNINSTALLED_PACKAGES); PackageManager.MATCH_UNINSTALLED_PACKAGES);
if (info != null) { if (info != null) {
DeleteObserver observer = new DeleteObserver(pkgName); DeleteObserver observer = new DeleteObserver(pkgName);
getPm().deletePackage(pkgName, observer, PackageManager.DELETE_ALL_USERS); getPm().deletePackage(pkgName, observer, PackageManager.DELETE_ALL_USERS);
observer.waitForCompletion(MAX_WAIT_TIME); observer.waitForCompletion(MAX_WAIT_TIME);
assertUninstalled(info); assertUninstalled(info);
} }
} catch (NameNotFoundException e) { } catch (IllegalArgumentException | NameNotFoundException e) {
} }
} }