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

Commit c2176181 authored by Sumedh Sen's avatar Sumedh Sen Committed by Automerger Merge Worker
Browse files

Merge "Replacing overlapping flag value" into udc-dev am: e0a5db49 am: 52ca1aac 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23204701



Change-Id: Ib49536f0a7a768d9948750fd2233c1ed535e8a3f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6eca4c1a 52ca1aac

core/java/android/content/Intent.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -6907,7 +6907,7 @@ public class Intent implements Parcelable, Cloneable { 
     *

     *

     * @hide

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







     * If set, the new activity is not kept in the history stack.  As soon as