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

Commit 3fce56e7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Mark the stack nullable so IntelliJ will warn about using it without a... 

Merge "Mark the stack nullable so IntelliJ will warn about using it without a null check." into qt-dev
parents 261b3b13 c650a147

packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import static java.lang.annotation.ElementType.LOCAL_VARIABLE; 
import static java.lang.annotation.ElementType.PARAMETER;

import static java.lang.annotation.RetentionPolicy.SOURCE;



import android.annotation.Nullable;

import android.app.ActivityManager;

import android.app.ActivityManager.RunningTaskInfo;

import android.app.ActivityTaskManager;
@@ -61,6 +60,7 @@ import android.widget.FrameLayout; 


import androidx.annotation.IntDef;

import androidx.annotation.MainThread;

import androidx.annotation.Nullable;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.statusbar.IStatusBarService;
@@ -139,7 +139,7 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
    @Nullable private BubbleStackView.SurfaceSynchronizer mSurfaceSynchronizer;



    private BubbleData mBubbleData;

    private BubbleStackView mStackView;

    @Nullable private BubbleStackView mStackView;



    // Bubbles get added to the status bar view

    private final StatusBarWindowController mStatusBarWindowController;