From 2056eccb40956d5a6e153192645ae225f38d785f Mon Sep 17 00:00:00 2001 From: Hani Kazmi Date: Thu, 26 Jan 2023 14:09:44 +0000 Subject: [PATCH 1/2] Update activity-security feature flag string Updates flag to match what is propogated by GMS Bug: 258792202 Test: Manually verified on device Change-Id: I4a4222914fa696e971d25dc06a22a0628282d50a --- .../server/wm/ActivitySecurityModelFeatureFlags.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/wm/ActivitySecurityModelFeatureFlags.java b/services/core/java/com/android/server/wm/ActivitySecurityModelFeatureFlags.java index 47e78f0c6e9bc..91c4a2ff03e0b 100644 --- a/services/core/java/com/android/server/wm/ActivitySecurityModelFeatureFlags.java +++ b/services/core/java/com/android/server/wm/ActivitySecurityModelFeatureFlags.java @@ -43,9 +43,12 @@ class ActivitySecurityModelFeatureFlags { static final String DOC_LINK = "go/android-asm"; private static final String NAMESPACE = NAMESPACE_WINDOW_MANAGER; - private static final String KEY_ASM_RESTRICTIONS_ENABLED = "asm_restrictions_enabled"; - private static final String KEY_ASM_TOASTS_ENABLED = "asm_toasts_enabled"; - private static final String KEY_ASM_EXEMPTED_PACKAGES = "asm_exempted_packages"; + private static final String KEY_ASM_PREFIX = "ActivitySecurity__"; + private static final String KEY_ASM_RESTRICTIONS_ENABLED = KEY_ASM_PREFIX + + "asm_restrictions_enabled"; + private static final String KEY_ASM_TOASTS_ENABLED = KEY_ASM_PREFIX + "asm_toasts_enabled"; + private static final String KEY_ASM_EXEMPTED_PACKAGES = KEY_ASM_PREFIX + + "asm_exempted_packages"; private static final int VALUE_DISABLE = 0; private static final int VALUE_ENABLE_FOR_U = 1; private static final int VALUE_ENABLE_FOR_ALL = 2; From c3daaeb0762238b429e2311a0e5815d0b6e0e952 Mon Sep 17 00:00:00 2001 From: Hani Kazmi Date: Thu, 26 Jan 2023 14:35:36 +0000 Subject: [PATCH 2/2] Update asm logging version to 2. Now that our new rules are nearing finalisation, this allows us to filter to the new logic when analysing impact. Bug: 258792202 Test: Tested on device Change-Id: Ifba2892bec505f44856d91b5628d8dd98d7319ff --- services/core/java/com/android/server/wm/ActivityStarter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index d6d3dc7b6ee28..50eb356a0b377 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -1965,7 +1965,7 @@ class ActivityStarter { /* action */ action, /* version */ - 1, + 2, /* multi_window - we have our source not in the target task, but both are visible */ targetTask != null && mSourceRecord != null && !targetTask.equals(mSourceRecord.getTask()) && targetTask.isVisible()