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

Commit 1300b084 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

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

am: 1b179a6e

Change-Id: If0dacafd10eaabb43f54f72bc49829d73ec86b96
parents 3e389efb 1b179a6e

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