commit 601406be4f1e79830bb13ab69f382b467b0df6ba
author android-build-team Robot <android-build-team-robot@google.com> Mon Apr 30 11:58:56 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Apr 30 11:58:56 2018 -0700
tree d00c1eb07cb3f0877a80c80cb723f82d896b1a6f
parent aeb00988dafc86595b253239d5e5d321ebc60880
parent 9ed7579e74659a2e432e151b7bbe8a04597eb469

Merge "Remove package code path for all parsing failure" into pi-dev
am: 9ed7579e74

Change-Id: I367a8668ad8c216091916d7a333c661f0295d7ba

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

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 6f9fd58..5873f57 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -8429,7 +8429,7 @@
 
                 // Delete invalid userdata apps
                 if ((scanFlags & SCAN_AS_SYSTEM) == 0 &&
-                        errorCode == PackageManager.INSTALL_FAILED_INVALID_APK) {
+                        errorCode != PackageManager.INSTALL_SUCCEEDED) {
                     logCriticalInfo(Log.WARN,
                             "Deleting invalid package at " + parseResult.scanFile);
                     removeCodePathLI(parseResult.scanFile);