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

Commit 3a94c396 authored by Jeff Chang's avatar Jeff Chang Committed by Android (Google) Code Review
Browse files

Merge "Passing activity token for identify sourceTask" into udc-dev

parents 646ad055 a7430a10

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

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

import android.annotation.UserHandleAware;

import android.app.Activity;

import android.app.ActivityOptions;

import android.app.AppOpsManager.Mode;

import android.app.admin.DevicePolicyManager;

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

                    targetUser.getIdentifier(),

                    true,

                    null,

                    null);

                    mContext.getActivityToken(),

                    ActivityOptions.makeBasic().toBundle());

        } catch (RemoteException ex) {

            throw ex.rethrowFromSystemServer();

        }

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

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

            launchIntent.setAction(Intent.ACTION_MAIN);

            launchIntent.addCategory(Intent.CATEGORY_LAUNCHER);

            if (targetTask == null) {

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

                launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK

                        | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);

            } else {