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

Commit 2820ef3c authored by Jeff Chang's avatar Jeff Chang Committed by Automerger Merge Worker
Browse files

Merge "Passing activity token for identify sourceTask" into udc-dev am: 3a94c396 

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



Change-Id: Icae4478ef244d7bfda6af64f813b73e0667d8af2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7d6cf6f0 3a94c396

core/java/android/content/pm/CrossProfileApps.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ import android.annotation.SystemApi; 
import android.annotation.TestApi;

import android.annotation.TestApi;

import android.annotation.UserHandleAware;

import android.annotation.UserHandleAware;

import android.app.Activity;

import android.app.Activity;

import android.app.ActivityOptions;

import android.app.AppOpsManager.Mode;

import android.app.AppOpsManager.Mode;

import android.app.admin.DevicePolicyManager;

import android.app.admin.DevicePolicyManager;

import android.content.ComponentName;

import android.content.ComponentName;
@@ -110,8 +111,8 @@ public class CrossProfileApps { 
                    component,

                    component,

                    targetUser.getIdentifier(),

                    targetUser.getIdentifier(),

                    true,

                    true,

                    null,

                    mContext.getActivityToken(),

                    null);

                    ActivityOptions.makeBasic().toBundle());

        } catch (RemoteException ex) {

        } catch (RemoteException ex) {

            throw ex.rethrowFromSystemServer();

            throw ex.rethrowFromSystemServer();

        }

        }

services/core/java/com/android/server/pm/CrossProfileAppsServiceImpl.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -147,7 +147,7 @@ public class CrossProfileAppsServiceImpl extends ICrossProfileApps.Stub { 
        if (launchMainActivity) {

        if (launchMainActivity) {

            launchIntent.setAction(Intent.ACTION_MAIN);

            launchIntent.setAction(Intent.ACTION_MAIN);

            launchIntent.addCategory(Intent.CATEGORY_LAUNCHER);

            launchIntent.addCategory(Intent.CATEGORY_LAUNCHER);

            if (targetTask == null) {

            if (targetTask == null || options != null) {

                launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK

                launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK

                        | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);

                        | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);

            } else {

            } else {