Merge "Fix NPE for Open With ChooserActivity Logging Bug" into rvc-dev am: 7e9bfdfd63 am: 9b2b5a114a am: 9d2209281e

Change-Id: Idaaeb612c5b07910c8cc181d03349bae3191f7bf
2020-04-06 22:48:28 +00:00
parent 0ac9e4dbee 9d2209281e
commit 8c9fd1a9c1
1 changed files with 3 additions and 0 deletions
--- 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;