From ef5afa073b4a8c80ac5f28ccc02e1d0b42b1560f Mon Sep 17 00:00:00 2001
From: Marco Nelissen <marcone@google.com>
Date: Fri, 3 Sep 2010 09:25:33 -0700
Subject: Do not merge. Don't crash when extra logging is enabled.

Change-Id: Iaf0900fe9d541967d2b2f11d8900c290c63a102e
---
 services/java/com/android/server/PackageManagerService.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to '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 b70d69b..8508537 100644
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@ -1997,7 +1997,11 @@ class PackageManagerService extends IPackageManager.Stub {
                     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++) {
-- 
cgit v1.1