From bf3e37f712e55c28bc610a12694e86aa45d5af77 Mon Sep 17 00:00:00 2001 From: Patrick Baumann Date: Mon, 28 Jun 2021 21:36:34 +0000 Subject: [PATCH] Revert "Fixes incorrect array type comparison" This reverts commit b05db2511b1f326a66c2478e0466a5a1d17b7e11. Reason for revert: b/192281479 Bug: 192281479 Change-Id: Idf3f78304904a50b4937720c997409f2d3a93837 --- .../core/java/com/android/server/pm/AppsFilter.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/services/core/java/com/android/server/pm/AppsFilter.java b/services/core/java/com/android/server/pm/AppsFilter.java index d04cb6f17054a..d9e93e6941e95 100644 --- a/services/core/java/com/android/server/pm/AppsFilter.java +++ b/services/core/java/com/android/server/pm/AppsFilter.java @@ -18,7 +18,6 @@ package com.android.server.pm; import static android.os.Trace.TRACE_TAG_PACKAGE_MANAGER; import static android.os.UserHandle.USER_ALL; -import static android.os.UserHandle.USER_NULL; import static android.provider.DeviceConfig.NAMESPACE_PACKAGE_MANAGER_SERVICE; import static com.android.internal.annotations.VisibleForTesting.Visibility.PRIVATE; @@ -839,14 +838,8 @@ public class AppsFilter implements Watchable, Snappable { private void updateEntireShouldFilterCache(int subjectUserId) { mStateProvider.runWithState((settings, users) -> { - int userId = USER_NULL; - for (int u = 0; u < users.length; u++) { - if (subjectUserId == users[u].id) { - userId = subjectUserId; - break; - } - } - if (userId == USER_NULL) { + int userId = subjectUserId; + if (!ArrayUtils.contains(users, subjectUserId)) { Slog.e(TAG, "We encountered a new user that isn't a member of known users, " + "updating the whole cache"); userId = USER_ALL; @@ -868,7 +861,7 @@ public class AppsFilter implements Watchable, Snappable { if (UserHandle.getUserId(uid2) == userId) { continue; } - cache.put(uid1, uid2, mShouldFilterCache.get(uid1, uid2)); + cache.setValueAt(uid1, uid2, mShouldFilterCache.valueAt(uid1, uid2)); } } }