From 40a1ea08022167a1b28ca7d10e757c33ac23716d Mon Sep 17 00:00:00 2001 From: Achim Thesmann Date: Thu, 16 Feb 2023 11:41:33 -0800 Subject: [PATCH] Rename feature flag to match mendel config. Currently the feature flag and the mendel flag do not match and therefore configuration changes in mendel do not take effect. Test: atest ActivityStarterTests BackgroundActivityLaunchTest Bug: 269240329 Change-Id: Icf649807dcaabc49a19b0aca4f6922d546ce4ca3 --- .../core/java/com/android/server/am/PendingIntentRecord.java | 3 ++- .../src/com/android/server/wm/ActivityStarterTests.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/am/PendingIntentRecord.java b/services/core/java/com/android/server/am/PendingIntentRecord.java index 14ecf9facec12..daf227c029a12 100644 --- a/services/core/java/com/android/server/am/PendingIntentRecord.java +++ b/services/core/java/com/android/server/am/PendingIntentRecord.java @@ -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; diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java index 28e493e062f76..e3cb5fb205c60 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java @@ -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;