From c4858a2ba972e86436d629c4d3f18eb49116de14 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Mon, 16 Jun 2014 10:51:20 -0700 Subject: Switch PackageParser to reference single path. It previously kept mPath separate from mScanPath for some very odd edge cases around moving apps-on-SD. This changes it to always use a single path, refactors moving to keep separate paths. Refactors method names in PackageParser to be clearer about their APK-versus-package relationship. Beginnings of a split package parser. Instead of requiring that callers check error codes when null, switch to always throwing on parse errors, to require that callers deal with the error. Longer term the entire parser should switch to this style, but its too pervasive for a simple refactoring. Change-Id: If071d8e55e46e56cc201fadfb51cb471713ae973 --- .../src/com/android/defcontainer/DefaultContainerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java b/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java index ec87c6e..2ed3d73 100644 --- a/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java +++ b/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java @@ -170,7 +170,7 @@ public class DefaultContainerService extends IntentService { DisplayMetrics metrics = new DisplayMetrics(); metrics.setToDefaults(); - PackageParser.PackageLite pkg = PackageParser.parsePackageLite(packagePath, 0); + PackageParser.ApkLite pkg = PackageParser.parseApkLite(packagePath, 0); if (pkg == null) { Slog.w(TAG, "Failed to parse package"); -- cgit v1.1