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

Commit 33f71014 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
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
parents f8e7774a 1300b084

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

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

import android.view.CompositionSamplingListener;

import android.view.SurfaceControl;

import android.view.SurfaceControl;

import android.view.View;

import android.view.View;

import android.view.ViewRootImpl;

import android.view.ViewTreeObserver;

import android.view.ViewTreeObserver;





import com.android.systemui.R;

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

        boolean isSamplingEnabled = mSamplingEnabled && !mSamplingRequestBounds.isEmpty()

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

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

        if (isSamplingEnabled) {

        if (isSamplingEnabled) {

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

            ViewRootImpl viewRootImpl = mSampledView.getViewRootImpl();

            if (!stopLayerControl.isValid()) {

            SurfaceControl stopLayerControl = null;

            if (viewRootImpl != null) {

                 stopLayerControl = viewRootImpl.getSurfaceControl();

            }

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

                if (!mWaitingOnDraw) {

                if (!mWaitingOnDraw) {

                    mWaitingOnDraw = true;

                    mWaitingOnDraw = true;

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

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