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

Merge "Add aborted start result." into oc-dev am: 8796c20dae

Browse Source 
am: 943794bb70

Change-Id: I9bf7aa7a5b1e8fbf7ccdea5a883c0ce98fa8f3ff
This commit is contained in:
Bryce Lee
2017-06-27 04:27:08 +00:00
committed by android-build-merger
parent bc1db397eb 943794bb70
commit ee289616fb
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/app/ActivityManager.java
View File

@@ -359,6 +359,13 @@ public class ActivityManager {
public static final int START_RETURN_LOCK_TASK_MODE_VIOLATION =
FIRST_START_NON_FATAL_ERROR_CODE + 1;
/**
* Result for IActivityManaqer.startActivity: a new activity start was aborted. Never returned
* externally.
* @hide
*/
public static final int START_ABORTED = FIRST_START_NON_FATAL_ERROR_CODE + 2;
/**
* Flag for IActivityManaqer.startActivity: do special start mode where
* a new activity is launched only if it is needed.