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

Commit c0046d83 authored Feb 23, 2023 by Achim Thesmann Committed by Automerger Merge Worker Feb 23, 2023

Merge "Rename feature flag to match mendel config." into udc-dev am: d636ddc6

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

Change-Id: Ib6b8c748bfe9f5899a6c8111ddf6f6abdc5a4e55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents c10c80d3 d636ddc6

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;