Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeff Chang
2023-05-12 16:56:22 +00:00
committed by Android (Google) Code Review
parent 646ad05577 a7430a100f
commit 3a94c396de
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/content/pm/CrossProfileApps.java
View File

@@ -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();
} }

2
services/core/java/com/android/server/pm/CrossProfileAppsServiceImpl.java
View File

@@ -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 {