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

Commit febd19ac authored by Aurélien Pomini's avatar Aurélien Pomini Committed by Android (Google) Code Review
Browse files

Merge "Avoid any NPE in ImageWallpaper#onDestroy" into main

parents e93c4bc9 ddbcecbb

packages/SystemUI/src/com/android/systemui/wallpapers/ImageWallpaper.java

+6 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static android.app.WallpaperManager.SetWallpaperFlags; 


import android.app.WallpaperColors;

import android.app.WallpaperManager;

import android.content.Context;

import android.graphics.Bitmap;

import android.graphics.Canvas;

import android.graphics.RecordingCanvas;
@@ -183,8 +184,11 @@ public class ImageWallpaper extends WallpaperService { 


        @Override

        public void onDestroy() {

            getDisplayContext().getSystemService(DisplayManager.class)

                    .unregisterDisplayListener(this);

            Context context = getDisplayContext();

            if (context != null) {

                DisplayManager displayManager = context.getSystemService(DisplayManager.class);

                if (displayManager != null) displayManager.unregisterDisplayListener(this);

            }

            mWallpaperLocalColorExtractor.cleanUp();

        }