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

Merge "Add shell command to populate lock task option"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-02 12:21:18 +00:00
committed by Android (Google) Code Review
parent 928835ebf1 8aedcc8b97
commit cf4a62f567
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/am/ActivityManagerShellCommand.java
View File

@@ -115,6 +115,7 @@ final class ActivityManagerShellCommand extends ShellCommand {
private int mActivityType;
private int mTaskId;
private boolean mIsTaskOverlay;
private boolean mIsLockTask;
final boolean mDumping;
@@ -278,6 +279,7 @@ final class ActivityManagerShellCommand extends ShellCommand {
mActivityType = ACTIVITY_TYPE_UNDEFINED;
mTaskId = INVALID_TASK_ID;
mIsTaskOverlay = false;
mIsLockTask = false;
return Intent.parseCommandArgs(this, new Intent.CommandOptionHandler() {
@Override
@@ -334,6 +336,8 @@ final class ActivityManagerShellCommand extends ShellCommand {
mTaskId = Integer.parseInt(getNextArgRequired());
} else if (opt.equals("--task-overlay")) {
mIsTaskOverlay = true;
} else if (opt.equals("--lock-task")) {
mIsLockTask = true;
} else {
return false;
}
@@ -429,13 +433,22 @@ final class ActivityManagerShellCommand extends ShellCommand {
options.setLaunchActivityType(mActivityType);
}
if (mTaskId != INVALID_TASK_ID) {
options = ActivityOptions.makeBasic();
if (options == null) {
options = ActivityOptions.makeBasic();
}
options.setLaunchTaskId(mTaskId);
if (mIsTaskOverlay) {
options.setTaskOverlay(true, true /* canResume */);
}
}
android.util.Log.d("bfranz", "I was here: " + mIsLockTask);
if (mIsLockTask) {
if (options == null) {
options = ActivityOptions.makeBasic();
}
options.setLockTaskMode(true);
}
if (mWaitOption) {
result = mInterface.startActivityAndWait(null, null, intent, mimeType,
null, null, 0, mStartFlags, profilerInfo,