Merge "Fix NPE in QuickstepTestInformationHandler#getWindowInsets" into main

This commit is contained in:
Treehugger Robot
2024-10-29 20:34:54 +00:00
committed by Android (Google) Code Review
@@ -3,7 +3,6 @@ package com.android.quickstep;
import static com.android.launcher3.taskbar.TaskbarThresholdUtils.getFromNavThreshold;
import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
import android.app.Activity;
import android.content.Context;
import android.content.res.Resources;
import android.os.Bundle;
@@ -208,8 +207,9 @@ public class QuickstepTestInformationHandler extends TestInformationHandler {
RecentsAnimationDeviceState rads = new RecentsAnimationDeviceState(mContext);
OverviewComponentObserver observer = new OverviewComponentObserver(mContext, rads);
try {
return observer.getContainerInterface()
.getCreatedContainer().getRootView().getRootWindowInsets();
RecentsViewContainer container = observer.getContainerInterface().getCreatedContainer();
return container == null ? null : container.getRootView().getRootWindowInsets();
} finally {
observer.onDestroy();
rads.destroy();