Merge "Fix IME always focusing bubbles" (90db0daf) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import static com.android.wm.shell.bubbles.BubbleOverflowActivity.EXTRA_BUBBLE_C
		import android.annotation.NonNull;
		import android.annotation.SuppressLint;
		import android.app.ActivityOptions;
		import android.app.ActivityTaskManager;
		import android.app.PendingIntent;
		import android.content.ComponentName;
		import android.content.Context;
		@@ -41,6 +42,7 @@ import android.graphics.Outline;
		import android.graphics.Rect;
		import android.graphics.drawable.ShapeDrawable;
		import android.os.Bundle;
		import android.os.RemoteException;
		import android.util.AttributeSet;
		import android.util.Log;
		import android.view.SurfaceControl;
		@@ -647,6 +649,13 @@ public class BubbleExpandedView extends LinearLayout {
		if (DEBUG_BUBBLE_EXPANDED_VIEW) {
		Log.d(TAG, "cleanUpExpandedState: bubble=" + getBubbleKey() + " task=" + mTaskId);
		}
		if (getTaskId() != INVALID_TASK_ID) {
		try {
		ActivityTaskManager.getService().removeTask(getTaskId());
		} catch (RemoteException e) {
		Log.w(TAG, e.getMessage());
		}
		}
		if (mTaskView != null) {
		mTaskView.release();
		}