diff options
| author | Marco Nelissen <marcone@google.com> | 2010-09-03 09:25:33 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2010-10-07 15:49:38 -0700 |
| commit | ef5afa073b4a8c80ac5f28ccc02e1d0b42b1560f (patch) | |
| tree | d674f5ce53b3284c4bb634949c7ec3e87d161f57 | |
| parent | 30264c9b85109ae58c1e472a747bf47464cc1632 (diff) | |
| download | frameworks_base-ef5afa073b4a8c80ac5f28ccc02e1d0b42b1560f.zip frameworks_base-ef5afa073b4a8c80ac5f28ccc02e1d0b42b1560f.tar.gz frameworks_base-ef5afa073b4a8c80ac5f28ccc02e1d0b42b1560f.tar.bz2 | |
Do not merge.
Don't crash when extra logging is enabled.
Change-Id: Iaf0900fe9d541967d2b2f11d8900c290c63a102e
| -rw-r--r-- | services/java/com/android/server/PackageManagerService.java | 6 |
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 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++) { |