From 94c28e75c61a321255bcdca7b325917096d1ac73 Mon Sep 17 00:00:00 2001 From: Beverly Date: Fri, 15 Jun 2018 11:04:02 -0400 Subject: [PATCH] Skip null values in Utils.safeForeach Test: ZenModeControllerImplTest.java Bug: 110209145 Change-Id: I4234be630c84444a70d8cb380ca6a692a4ff5cbc --- .../systemui/statusbar/policy/ZenModeControllerImpl.java | 4 ---- packages/SystemUI/src/com/android/systemui/util/Utils.java | 7 +++++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ZenModeControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ZenModeControllerImpl.java index 2031b27c93f29..59b376f311fb3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ZenModeControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ZenModeControllerImpl.java @@ -113,10 +113,6 @@ public class ZenModeControllerImpl extends CurrentUserTracker implements ZenMode @Override public void addCallback(Callback callback) { - if (callback == null) { - Slog.e(TAG, "Attempted to add a null callback."); - return; - } mCallbacks.add(callback); } diff --git a/packages/SystemUI/src/com/android/systemui/util/Utils.java b/packages/SystemUI/src/com/android/systemui/util/Utils.java index eca612776f212..6812410c851cf 100644 --- a/packages/SystemUI/src/com/android/systemui/util/Utils.java +++ b/packages/SystemUI/src/com/android/systemui/util/Utils.java @@ -26,11 +26,14 @@ public class Utils { /** * Allows lambda iteration over a list. It is done in reverse order so it is safe - * to add or remove items during the iteration. + * to add or remove items during the iteration. Skips over null items. */ public static void safeForeach(List list, Consumer c) { for (int i = list.size() - 1; i >= 0; i--) { - c.accept(list.get(i)); + T item = list.get(i); + if (item != null) { + c.accept(item); + } } }