Merge "Fix NPE for Open With ChooserActivity Logging Bug" into rvc-dev

1 files changed, 3 insertions, 0 deletions

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;