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

Commit e6c25d4a authored by Bryce Lee's avatar Bryce Lee
Browse files

Handle not having main window in createThumbnailAppAnimator. 

A recent code change associated the SurfaceControl with the main
window owner id. However, it is possible for the an AppWindowToken to
not have a main window. This case is handled later in the method.

This CL restores the original behavior of using the calling uid in
the cases no main window is present.

Change-Id: I8255be9e0d68adc75fda0947c64f869b7eeb76c9
Fixes: 62096254
Test: go/wm-smoke
parent 94ea9bb5

services/core/java/com/android/server/wm/WindowSurfacePlacer.java

+3 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.content.res.Configuration; 
import android.graphics.GraphicBuffer;

import android.graphics.PixelFormat;

import android.graphics.Rect;

import android.os.Binder;

import android.os.Debug;

import android.os.Trace;

import android.util.ArraySet;
@@ -693,7 +694,8 @@ class WindowSurfacePlacer { 
            SurfaceControl surfaceControl = new SurfaceControl(mService.mFxSession,

                    "thumbnail anim", dirty.width(), dirty.height(),

                    PixelFormat.TRANSLUCENT, SurfaceControl.HIDDEN,

                    appToken.windowType, window.mOwnerUid);

                    appToken.windowType,

                    window != null ? window.mOwnerUid : Binder.getCallingUid());

            surfaceControl.setLayerStack(display.getLayerStack());

            if (SHOW_TRANSACTIONS) {

                Slog.i(TAG, "  THUMBNAIL " + surfaceControl + ": CREATE");