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

Commit 479d8b3f authored by Achim Thesmann's avatar Achim Thesmann Committed by Android (Google) Code Review
Browse files

Merge "Rename feature flag to match mendel config."

parents b249a880 a91f1819

services/core/java/com/android/server/am/PendingIntentRecord.java

+2 −1
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ public final class PendingIntentRecord extends IIntentSender.Stub { 
    @Overridable

    private static final long DEFAULT_RESCIND_BAL_PRIVILEGES_FROM_PENDING_INTENT_SENDER = 244637991;

    private static final String ENABLE_DEFAULT_RESCIND_BAL_PRIVILEGES_FROM_PENDING_INTENT_SENDER =

            "enable_default_rescind_bal_privileges_from_pending_intent_sender";

            "DefaultRescindBalPrivilegesFromPendingIntentSender__"

                    + "enable_default_rescind_bal_privileges_from_pending_intent_sender";



    public static final int FLAG_ACTIVITY_SENDER = 1 << 0;

    public static final int FLAG_BROADCAST_SENDER = 1 << 1;

services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java

+2 −1
Original line number Diff line number Diff line
@@ -145,7 +145,8 @@ import java.util.Set; 
public class ActivityStarterTests extends WindowTestsBase {



    private static final String ENABLE_DEFAULT_RESCIND_BAL_PRIVILEGES_FROM_PENDING_INTENT_SENDER =

            "enable_default_rescind_bal_privileges_from_pending_intent_sender";

            "DefaultRescindBalPrivilegesFromPendingIntentSender__"

                    + "enable_default_rescind_bal_privileges_from_pending_intent_sender";

    private static final int PRECONDITION_NO_CALLER_APP = 1;

    private static final int PRECONDITION_NO_INTENT_COMPONENT = 1 << 1;

    private static final int PRECONDITION_NO_ACTIVITY_INFO = 1 << 2;