Do not merge.

Don't crash when extra logging is enabled.

Change-Id: Iaf0900fe9d541967d2b2f11d8900c290c63a102e

Author: marcone

services/java/com/android/server/PackageManagerService.java

@@ -1997,7 +1997,11 @@ ResolveInfo findPreferredActivity(Intent intent, String resolvedType,
                     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++) {