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

Commit 56d150ed authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Integer to int causes null exception" into sc-dev

parents 2aca0299 48191afa

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -1300,8 +1300,9 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
                    if (callbacks == null) return;

                    if (callbacks == null) return;

                    callbacks.broadcast(c -> {

                    callbacks.broadcast(c -> {

                        try {

                        try {

                            int targetDisplayId =

                            Integer targetDisplayId =

                                    callbackDisplayIds.get(c.asBinder());

                                    callbackDisplayIds.get(c.asBinder());

                            if (targetDisplayId == null) return;

                            if (targetDisplayId == displayId) c.onColorsChanged(area, colors);

                            if (targetDisplayId == displayId) c.onColorsChanged(area, colors);

                        } catch (RemoteException e) {

                        } catch (RemoteException e) {

                            e.printStackTrace();

                            e.printStackTrace();