summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2010-09-03 09:25:33 -0700
committerMarco Nelissen <marcone@google.com>2010-10-07 10:25:16 -0700
commitbb03053113455fe3be4f16c73d05a0cf4d6dcf50 (patch)
tree5dd121595411fea7915a54dc4cd6e7bbe3f72a80
parente9a83c49c7f5c2524226ddefc21105deb14d80db (diff)
downloadbase-bb03053113455fe3be4f16c73d05a0cf4d6dcf50.tar.gz
Don't crash when extra logging is enabled.
Change-Id: I926f226238042dd8e9bcd60bee49b8c6b4133621
-rw-r--r--services/java/com/android/server/PackageManagerService.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java
index 86504a095daf..fc62c1c1ab46 100644
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@ -1495,7 +1495,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++) {