diff options
author | Samuel Fufa <sfufa@google.com> | 2019-08-14 14:26:05 -0700 |
---|---|---|
committer | Samuel Fufa <sfufa@google.com> | 2019-08-14 15:12:43 -0700 |
commit | 8628eb9353462b66e3120bf9a79b8c6c56d9e481 (patch) | |
tree | eb480c5ff4d14ff8888c77644426015e323285c7 /src | |
parent | 23582eb7c0792045cca1ff23f6e81f7eb63a5af1 (diff) | |
download | android_packages_apps_Trebuchet-8628eb9353462b66e3120bf9a79b8c6c56d9e481.tar.gz android_packages_apps_Trebuchet-8628eb9353462b66e3120bf9a79b8c6c56d9e481.tar.bz2 android_packages_apps_Trebuchet-8628eb9353462b66e3120bf9a79b8c6c56d9e481.zip |
Sorting people by key crashes launcher
Approch: approach: filter out people with null getKey before sorting.
Bug:139436782
Change-Id: I6510a12374ff4fec02c879ff76ba42b1fcdb8281
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/notification/NotificationKeyData.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/com/android/launcher3/notification/NotificationKeyData.java b/src/com/android/launcher3/notification/NotificationKeyData.java index bfa4ba9ab..a1917ecb0 100644 --- a/src/com/android/launcher3/notification/NotificationKeyData.java +++ b/src/com/android/launcher3/notification/NotificationKeyData.java @@ -20,15 +20,13 @@ import android.app.Notification; import android.app.Person; import android.service.notification.StatusBarNotification; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.android.launcher3.Utilities; + import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; import java.util.List; -import java.util.Set; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; /** * The key data associated with the notification, used to determine what to include @@ -39,8 +37,9 @@ import androidx.annotation.Nullable; public class NotificationKeyData { public final String notificationKey; public final String shortcutId; + @NonNull + public final String[] personKeysFromNotification; public int count; - @NonNull public final String[] personKeysFromNotification; private NotificationKeyData(String notificationKey, String shortcutId, int count, String[] personKeysFromNotification) { @@ -70,7 +69,8 @@ public class NotificationKeyData { if (people == null || people.isEmpty()) { return Utilities.EMPTY_STRING_ARRAY; } - return people.stream().map(Person::getKey).sorted().toArray(String[]::new); + return people.stream().filter(person -> person.getKey() != null) + .map(Person::getKey).sorted().toArray(String[]::new); } @Override |