Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: If6cedd178266ae97d6a631c02dd9673602adbd3a
This commit is contained in:
Lucas Dupin
2021-06-23 19:00:05 +00:00
committed by Automerger Merge Worker
parent 1c884cbb56 ba23b84687
commit 75bc6a8797
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/WallpaperColors.java
View File

@@ -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);
} }