commit 65e59d9a26dad7c201aab6504ffb70f90c09c0ab
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sun Sep 22 22:59:48 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sun Sep 22 22:59:48 2024 +0000
tree f303d672b5edd1e78f6299655ffc41c34832d689
parent 64358d6ad3f947bb6437eb69a1df83976f03e1a8
parent 25c3761630a5dcbf729a0f175b9661f2980e6763

Merge "Ensure surface control is valid before trying BBQ update" into main

core/java/android/service/wallpaper/WallpaperService.java

diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java
index 384add5..2ab16e9 100644
--- a/core/java/android/service/wallpaper/WallpaperService.java
+++ b/core/java/android/service/wallpaper/WallpaperService.java
@@ -2397,7 +2397,11 @@
                 // it hasn't changed and there is no need to update.
                 ret = mBlastBufferQueue.createSurface();
             } else {
-                mBlastBufferQueue.update(mBbqSurfaceControl, width, height, format);
+                if (mBbqSurfaceControl != null && mBbqSurfaceControl.isValid()) {
+                    mBlastBufferQueue.update(mBbqSurfaceControl, width, height, format);
+                } else {
+                    Log.w(TAG, "Skipping BlastBufferQueue update - invalid surface control");
+                }
             }
 
             return ret;