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

Commit 2b50cf80 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Merge "Fixed an NPE in the RegionSamplingHelper" into qt-dev am:... 

Merge "Merge "Fixed an NPE in the RegionSamplingHelper" into qt-dev am: c821a520 am: 1b179a6e" into qt-r1-dev-plus-aosp
am: 33f71014

Change-Id: Ie70e3030240def5396a01969da4a3c2798f3daa1
parents 2f7f17da 33f71014

packages/SystemUI/src/com/android/systemui/statusbar/phone/RegionSamplingHelper.java

+7 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.provider.Settings; 
import android.view.CompositionSamplingListener;

import android.view.SurfaceControl;

import android.view.View;

import android.view.ViewRootImpl;

import android.view.ViewTreeObserver;



import com.android.systemui.R;
@@ -153,8 +154,12 @@ public class RegionSamplingHelper implements View.OnAttachStateChangeListener, 
        boolean isSamplingEnabled = mSamplingEnabled && !mSamplingRequestBounds.isEmpty()

                && (mSampledView.isAttachedToWindow() || mFirstSamplingAfterStart);

        if (isSamplingEnabled) {

            SurfaceControl stopLayerControl = mSampledView.getViewRootImpl().getSurfaceControl();

            if (!stopLayerControl.isValid()) {

            ViewRootImpl viewRootImpl = mSampledView.getViewRootImpl();

            SurfaceControl stopLayerControl = null;

            if (viewRootImpl != null) {

                 stopLayerControl = viewRootImpl.getSurfaceControl();

            }

            if (stopLayerControl == null || !stopLayerControl.isValid()) {

                if (!mWaitingOnDraw) {

                    mWaitingOnDraw = true;

                    // The view might be attached but we haven't drawn yet, so wait until the