Merge "Correctly serialize population" into sc-dev

2021-06-23 18:48:37 +00:00
parent cdd6adb5c5 ebd663f556
commit ba23b84687
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/app/WallpaperColors.java
+++ b/core/java/android/app/WallpaperColors.java
@@ -420,7 +420,7 @@ public final class WallpaperColors implements Parcelable {
        for (Map.Entry<Integer, Integer> colorEntry : mAllColors.entrySet()) {
            if (colorEntry.getKey() != null) {
                dest.writeInt(colorEntry.getKey());
-                Integer population = mAllColors.get(colorEntry.getValue());
+                Integer population = colorEntry.getValue();
                int populationInt = (population != null) ? population : 0;
                dest.writeInt(populationInt);
            }