commit 767225d8206adf4db968f3fa86d9ebb107a12067
author Jeff Brown <jeffbrown@google.com> Tue Mar 30 23:49:17 2010 -0700
committer Jeff Brown <jeffbrown@google.com> Tue Mar 30 23:49:17 2010 -0700
tree 140c2a0f460d096a0c031c2007d357610a297aa0
parent 2e41ffe7cfc9cb7666224217c38d46ccca57ca1a
parent d9ee01a95c8d9e785a48f1b1cb5245c8b12e444d

resolved conflicts for merge of d9ee01a9 to kraken

Change-Id: I645177513e6dfa4b3b02c0061b8026bde4acde8d

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

diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java
index 6f16ee7..a1a703f 100644
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@ -6303,7 +6303,7 @@
             Log.i(TAG, "Removing non-system package:"+p.packageName);
             // Kill application pre-emptively especially for apps on sd.
             killApplication(packageName, p.applicationInfo.uid);
-            ret = deleteInstalledPackageLI (p, deleteCodeAndResources, flags, outInfo);
+            ret = deleteInstalledPackageLI(p, deleteCodeAndResources, flags, outInfo);
         }
         return ret;
     }
@@ -7634,10 +7634,11 @@
         }
 
         void setFlags(int pkgFlags) {
-            this.pkgFlags = (pkgFlags & ApplicationInfo.FLAG_SYSTEM) |
-            (pkgFlags & ApplicationInfo.FLAG_FORWARD_LOCK) |
-            (pkgFlags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) |
-            (pkgFlags & ApplicationInfo.FLAG_NEVER_ENCRYPT);
+            this.pkgFlags = pkgFlags & (
+                    ApplicationInfo.FLAG_SYSTEM |
+                    ApplicationInfo.FLAG_FORWARD_LOCK |
+                    ApplicationInfo.FLAG_EXTERNAL_STORAGE |;
+                    ApplicationInfo.FLAG_NEVER_ENCRYPT);
         }
     }
 
@@ -9642,7 +9643,7 @@
                }
                // Parse package
                int parseFlags = PackageParser.PARSE_CHATTY |
-               PackageParser.PARSE_ON_SDCARD | mDefParseFlags;
+                       PackageParser.PARSE_ON_SDCARD | mDefParseFlags;
                PackageParser pp = new PackageParser(codePath);
                pp.setSeparateProcesses(mSeparateProcesses);
                final PackageParser.Package pkg = pp.parsePackage(new File(codePath),
@@ -9718,7 +9719,7 @@
                if (res) {
                    pkgList.add(pkgName);
                } else {
-                   Slog.e(TAG, "Failed to delete pkg  from sdcard : " + pkgName);
+                   Slog.e(TAG, "Failed to delete pkg from sdcard : " + pkgName);
                    failedList.add(args);
                }
            }