Merge "Replacing overlapping flag value" into udc-dev am: e0a5db492f am: 52ca1aac6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23204701 Change-Id: If7a39da9355c705de0528ae3bcea983cb21c7e50 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -6907,7 +6907,7 @@ public class Intent implements Parcelable, Cloneable {
|
||||
*
|
||||
* @hide
|
||||
*/
|
||||
public static final int FLAG_IGNORE_EPHEMERAL = 0x00000200;
|
||||
public static final int FLAG_IGNORE_EPHEMERAL = 0x80000000;
|
||||
|
||||
/**
|
||||
* If set, the new activity is not kept in the history stack. As soon as
|
||||
|
||||
Reference in New Issue
Block a user