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

Commit ba23b846 authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Correctly serialize population" into sc-dev

parents cdd6adb5 ebd663f5

core/java/android/app/WallpaperColors.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -420,7 +420,7 @@ public final class WallpaperColors implements Parcelable { 
        for (Map.Entry<Integer, Integer> colorEntry : mAllColors.entrySet()) {

        for (Map.Entry<Integer, Integer> colorEntry : mAllColors.entrySet()) {

            if (colorEntry.getKey() != null) {

            if (colorEntry.getKey() != null) {

                dest.writeInt(colorEntry.getKey());

                dest.writeInt(colorEntry.getKey());

                Integer population = mAllColors.get(colorEntry.getValue());

                Integer population = colorEntry.getValue();

                int populationInt = (population != null) ? population : 0;

                int populationInt = (population != null) ? population : 0;

                dest.writeInt(populationInt);

                dest.writeInt(populationInt);

            }

            }