summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Pierre Barbier de Reuille <pbdr@google.com> 2021-05-14 08:49:28 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-05-14 08:49:28 +0000
commit429e2a8b6a48c178a7d1ebc0032a0e2d12c39ddf (patch)
tree16190134343070451be1ecd11d055505fe7b603e
parent54580d720d8f9f61cc403cdd8d52357a7da39b9a (diff)
parent6bb5335193cb3ca754f460181294b76b32289810 (diff)
Merge "Test color mapping equivalent in O(n)" into sc-dev
-rw-r--r--core/java/android/appwidget/AppWidgetHostView.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/appwidget/AppWidgetHostView.java b/core/java/android/appwidget/AppWidgetHostView.java
index 2ed44ec648fb..ba3fc1e55c54 100644
--- a/core/java/android/appwidget/AppWidgetHostView.java
+++ b/core/java/android/appwidget/AppWidgetHostView.java
@@ -909,7 +909,8 @@ public class AppWidgetHostView extends FrameLayout {
return false;
}
for (int i = 0; i < oldColors.size(); i++) {
- if (oldColors.valueAt(i) != newColors.get(oldColors.keyAt(i))) {
+ if (oldColors.keyAt(i) != newColors.keyAt(i)
+ || oldColors.valueAt(i) != newColors.valueAt(i)) {
return false;
}
}