From 8bd0f532a32084799fa623de29d0e5938ca9b34c Mon Sep 17 00:00:00 2001
From: Susi Kharraz-Post <susikp@google.com>
Date: Mon, 6 Apr 2020 15:07:23 -0400
Subject: Fix NPE for Open With ChooserActivity Logging Bug

Target is not populated for "Open With" processed by ChooserActivity.
Adding a null catch in the logger to return default intent.

Bug: 153335691
Test: manual testing and running ChooserActivityTests
Change-Id: Ib7477a9030d0244d33d74690c6aab8b03b88e1e3
---
 core/java/com/android/internal/app/ChooserActivityLogger.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/java/com/android/internal/app/ChooserActivityLogger.java b/core/java/com/android/internal/app/ChooserActivityLogger.java
index dc482443040a..088973cde3e9 100644
--- a/core/java/com/android/internal/app/ChooserActivityLogger.java
+++ b/core/java/com/android/internal/app/ChooserActivityLogger.java
@@ -191,6 +191,9 @@ public interface ChooserActivityLogger {
      * ChooserActivity.
      */
     default int typeFromIntentString(String intent) {
+        if (intent == null) {
+            return FrameworkStatsLog.SHARESHEET_STARTED__INTENT_TYPE__INTENT_DEFAULT;
+        }
         switch (intent) {
             case Intent.ACTION_VIEW:
                 return FrameworkStatsLog.SHARESHEET_STARTED__INTENT_TYPE__INTENT_ACTION_VIEW;
-- 
cgit v1.2.3-59-g8ed1b