commit e7884d68a613e579a12a52455f6b5b13a90a0f8a
author Marco Nelissen <marcone@google.com> Fri Sep 03 11:51:28 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 03 11:51:28 2010 -0700
tree 219ac2bb1459d7608c91e6aec211d87a8b38ecdb
parent bc1452a307ac61ca87bf78722701ac85100952af
parent d85621c938286a568b1173e7ab29f80ab93d27e1

am d85621c9: Don\'t crash when extra logging is enabled.

Merge commit 'd85621c938286a568b1173e7ab29f80ab93d27e1' into gingerbread-plus-aosp

* commit 'd85621c938286a568b1173e7ab29f80ab93d27e1':
  Don't crash when extra logging is enabled.

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 f5862df..e3480a8 100644
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@ -2022,7 +2022,11 @@
                     ActivityInfo ai = getActivityInfo(pa.mActivity, flags);
                     if (DEBUG_PREFERRED) {
                         Log.v(TAG, "Got preferred activity:");
-                        ai.dump(new LogPrinter(Log.INFO, TAG), "  ");
+                        if (ai != null) {
+                            ai.dump(new LogPrinter(Log.VERBOSE, TAG), "  ");
+                        } else {
+                            Log.v(TAG, "  null");
+                        }
                     }
                     if (ai != null) {
                         for (int j=0; j<N; j++) {