Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Selim Cinek
2019-05-16 19:46:59 +00:00
committed by Android (Google) Code Review
parent 430ffac282 3f0edea3ac
commit c821a52062
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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