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

Commit 8b9febe1 authored by Mady Mellor's avatar Mady Mellor Committed by Android (Google) Code Review
Browse files

Merge "Ensure bubble bar gets excluded from the screenshot in app clips" into main

parents 86bc0b4e 0d2bfddf

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java

+3 −2
Original line number Diff line number Diff line
@@ -1457,8 +1457,9 @@ public class BubbleController implements ConfigurationChangeListener, 
            SynchronousScreenCaptureListener screenCaptureListener) {

        try {

            ScreenCapture.CaptureArgs args = null;

            if (mStackView != null) {

                ViewRootImpl viewRoot = mStackView.getViewRootImpl();

            View viewToUse = mStackView != null ? mStackView : mLayerView;

            if (viewToUse != null) {

                ViewRootImpl viewRoot = viewToUse.getViewRootImpl();

                if (viewRoot != null) {

                    SurfaceControl bubbleLayer = viewRoot.getSurfaceControl();

                    if (bubbleLayer != null) {