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

Commit 6d119e6c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow background activity launch by drag notification" into tm-qpr-dev am: d7e17f97 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19967613



Change-Id: I50aa8b936a3208bd38dc248b1e00c155e5ec4f46
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 77ed49fa d7e17f97

libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragAndDropPolicy.java

+5 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
package com.android.wm.shell.draganddrop;



import static android.app.ActivityTaskManager.INVALID_TASK_ID;

import static android.app.ComponentOptions.KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED;

import static android.app.ComponentOptions.KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED_BY_PERMISSION;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
@@ -263,6 +265,9 @@ public class DragAndDropPolicy { 
            mStarter.startShortcut(packageName, id, position, opts, user);

        } else {

            final PendingIntent launchIntent = intent.getParcelableExtra(EXTRA_PENDING_INTENT);

            // Put BAL flags to avoid activity start aborted.

            opts.putBoolean(KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED, true);

            opts.putBoolean(KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED_BY_PERMISSION, true);

            mStarter.startIntent(launchIntent, null /* fillIntent */, position, opts);

        }

    }

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+0 −5
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ package com.android.wm.shell.splitscreen; 


import static android.app.ActivityOptions.KEY_LAUNCH_ROOT_TASK_TOKEN;

import static android.app.ActivityTaskManager.INVALID_TASK_ID;

import static android.app.ComponentOptions.KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED;

import static android.app.ComponentOptions.KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED_BY_PERMISSION;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_ASSISTANT;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;
@@ -1109,9 +1107,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 


    private void addActivityOptions(Bundle opts, StageTaskListener stage) {

        opts.putParcelable(KEY_LAUNCH_ROOT_TASK_TOKEN, stage.mRootTaskInfo.token);

        // Put BAL flags to avoid activity start aborted.

        opts.putBoolean(KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED, true);

        opts.putBoolean(KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED_BY_PERMISSION, true);

    }



    void updateActivityOptions(Bundle opts, @SplitPosition int position) {