commit 9550f5dfa607b1c464c2673186ee26e4b12a79d6
author Clara Bayarri <clarabayarri@google.com> Wed May 11 11:20:13 2016 +0100
committer Clara Bayarri <clarabayarri@google.com> Wed May 11 14:57:37 2016 +0000
tree 187311c3dd8cc01e986a297a32903e29a0d1d0c6
parent ae8177d152db073602e0702e0fa9dd1e24c0a7d3

Fix crash in ResolverActivity

Bug: 28540294
Change-Id: Ib20b1c401e2c28226d9133bb8787f09f09169885
(cherry picked from commit b53b2bd088f122e5bd1e3d493178100d15d8cb7a)

core/java/com/android/internal/app/ResolverActivity.java

diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index 842ac1f..0a4ac0d 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -363,11 +363,12 @@
         if (isVoiceInteraction()) {
             onSetupVoiceInteraction();
         }
+        final Set<String> categories = intent.getCategories();
         MetricsLogger.action(this, mAdapter.hasFilteredItem()
                 ? MetricsProto.MetricsEvent.ACTION_SHOW_APP_DISAMBIG_APP_FEATURED
                 : MetricsProto.MetricsEvent.ACTION_SHOW_APP_DISAMBIG_NONE_FEATURED,
                 intent.getAction() + ":" + intent.getType() + ":"
-                        + Arrays.toString(intent.getCategories().toArray()));
+                        + (categories != null ? Arrays.toString(categories.toArray()) : ""));
     }
 
     public final void setFilteredComponents(ComponentName[] components) {