am 3233a0a6: Merge "Don\'t always dump domain/preferred state" into mnc-dev

* commit '3233a0a65c8bd2acce4b8fdfe6ce8e6c20b9a24d': Don't always dump domain/preferred state
2015-06-19 01:20:03 +00:00
parent 460a292594 3233a0a65c
commit 92f8cff8e4
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -14090,7 +14090,9 @@ public class PackageManagerService extends IPackageManager.Stub {
                }
            }

-            if (!checkin && dumpState.isDumping(DumpState.DUMP_DOMAIN_PREFERRED)) {
+            if (!checkin
+                    && dumpState.isDumping(DumpState.DUMP_DOMAIN_PREFERRED)
+                    && packageName == null) {
                pw.println();
                int count = mSettings.mPackages.size();
                if (count == 0) {