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

Commit 5c732b3f authored by Mark Renouf's avatar Mark Renouf
Browse files

Explicitly remove the task when a bubble is dismissed 

This prevents bubble-hosted tasks from appearing within recents.

RecentTasks filters bubble-hosted tasks while active by checking
the associated display in isUserVisibleRecent. After destroying,
the display (virtual display) is removed so the check no longer
works. Removing the task explicitly when dismissing solves this.

Test: manually, dismiss bubble, check recents
Bug: 131692350
Change-Id: Ia46e70ebba7095571457e1e4c8b2959263fc6828
parent d71f26f3

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

+22 −0
Original line number Diff line number Diff line
@@ -23,9 +23,11 @@ import static com.android.systemui.bubbles.BubbleDebugConfig.TAG_WITH_CLASS_NAME 


import android.annotation.Nullable;

import android.app.ActivityOptions;

import android.app.ActivityTaskManager;

import android.app.ActivityView;

import android.app.Notification;

import android.app.PendingIntent;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.pm.ApplicationInfo;
@@ -37,6 +39,7 @@ import android.graphics.Insets; 
import android.graphics.Point;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.ShapeDrawable;

import android.os.RemoteException;

import android.os.UserHandle;

import android.provider.Settings;

import android.service.notification.StatusBarNotification;
@@ -70,6 +73,8 @@ public class BubbleExpandedView extends LinearLayout implements View.OnClickList 
    private ActivityView mActivityView;



    private boolean mActivityViewReady = false;

    private int mTaskId = -1;



    private PendingIntent mBubbleIntent;



    private boolean mKeyboardVisible;
@@ -108,6 +113,14 @@ public class BubbleExpandedView extends LinearLayout implements View.OnClickList 
            mActivityViewReady = false;

        }



        @Override

        public void onTaskCreated(int taskId, ComponentName componentName) {

            // Since Bubble ActivityView applies singleTaskDisplay this is

            // guaranteed to only be called once per ActivityView. The taskId is

            // saved to use for removeTask, preventing appearance in recent tasks.

            mTaskId = taskId;

        }



        /**

         * This is only called for tasks on this ActivityView, which is also set to

         * single-task mode -- meaning never more than one task on this display. If a task
@@ -423,7 +436,16 @@ public class BubbleExpandedView extends LinearLayout implements View.OnClickList 
        if (mActivityViewReady) {

            mActivityView.release();

        }

        if (mTaskId != -1) {

            try {

                ActivityTaskManager.getService().removeTask(mTaskId);

            } catch (RemoteException e) {

                Log.w(TAG, "Failed to remove taskId " + mTaskId);

            }

            mTaskId = -1;

        }

        removeView(mActivityView);



        mActivityView = null;

        mActivityViewReady = false;

    }