Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75bc6a87 authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Correctly serialize population" into sc-dev am: ba23b846 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15081291

Change-Id: If6cedd178266ae97d6a631c02dd9673602adbd3a
parents 1c884cbb ba23b846

core/java/android/app/WallpaperColors.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

            }