commit 1f447d285aeb2b59f6a56b6e38afa26deb21dbf1
author Jonathan Miranda <jonmiranda@google.com> Wed Mar 28 21:31:34 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 28 21:31:34 2018 +0000
tree 89e326bd45b17e0fbf5f75bb2d8bf9fb14c60d80
parent 599b4940105251e3a2488787d9b9b5b783418b7c
parent 75161b975072f02e4d1c1a5e26dbfaf76e0e34f4

Merge "Pass intent extras as string arraylist." into ub-launcher3-master

src/com/android/launcher3/model/FirstScreenBroadcast.java

diff --git a/src/com/android/launcher3/model/FirstScreenBroadcast.java b/src/com/android/launcher3/model/FirstScreenBroadcast.java
index 2736509..1149b55 100644
--- a/src/com/android/launcher3/model/FirstScreenBroadcast.java
+++ b/src/com/android/launcher3/model/FirstScreenBroadcast.java
@@ -135,10 +135,10 @@
 
         context.sendBroadcast(new Intent(ACTION_FIRST_SCREEN_ACTIVE_INSTALLS)
                 .setPackage(installerPackageName)
-                .putExtra(FOLDER_ITEM_EXTRA, folderItems.toArray())
-                .putExtra(WORKSPACE_ITEM_EXTRA, workspaceItems.toArray())
-                .putExtra(HOTSEAT_ITEM_EXTRA, hotseatItems.toArray())
-                .putExtra(WIDGET_ITEM_EXTRA, widgetItems.toArray())
+                .putStringArrayListExtra(FOLDER_ITEM_EXTRA, new ArrayList<>(folderItems))
+                .putStringArrayListExtra(WORKSPACE_ITEM_EXTRA, new ArrayList<>(workspaceItems))
+                .putStringArrayListExtra(HOTSEAT_ITEM_EXTRA, new ArrayList<>(hotseatItems))
+                .putStringArrayListExtra(WIDGET_ITEM_EXTRA, new ArrayList<>(widgetItems))
                 .putExtra(VERIFICATION_TOKEN_EXTRA, PendingIntent.getActivity(context, 0,
                         new Intent(), PendingIntent.FLAG_ONE_SHOT)));
     }