resolved conflicts for merge of b0903104 to master

Change-Id: Iff20980c44d42b41ae411c4201e0927cee19d415

diff --cc services/java/com/android/server/PackageManagerService.java
index 1cf3bad,86504a0..3ffb8bf
--- 1/services/java/com/android/server/PackageManagerService.java
--- 2/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@@ -731,13 -628,13 +731,14 @@@ class PackageManagerService extends IPa
          }
      }
  
-     void cleanupInstallFailedPackage(PackageSetting pkgSettings) {
+     void cleanupInstallFailedPackage(PackageSetting ps) {
+         Log.i(TAG, "Cleaning up incompletely installed app: " + ps.name);
          if (mInstaller != null) {
-             boolean useSecureFS = useEncryptedFilesystemForPackage(pkgSettings.pkg);
-             int retCode = mInstaller.remove(pkgSettings.name, useSecureFS);
 -            int retCode = mInstaller.remove(ps.name);
++            boolean useSecureFS = useEncryptedFilesystemForPackage(ps.pkg);
++            int retCode = mInstaller.remove(ps.name, useSecureFS);
              if (retCode < 0) {
                  Log.w(TAG, "Couldn't remove app data directory for package: "
-                            + pkgSettings.name + ", retcode=" + retCode);
+                            + ps.name + ", retcode=" + retCode);
              }
          } else {
              //for emulator