Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "asm-flag-fix"

Browse Source 
* changes:
  Update asm logging version to 2.
  Update activity-security feature flag string
This commit is contained in:
Hani Kazmi
2023-01-27 16:32:33 +00:00
committed by Android (Google) Code Review
parent da5eb0598a c3daaeb076
commit d62b9a237a
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/wm/ActivitySecurityModelFeatureFlags.java
View File

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

2
services/core/java/com/android/server/wm/ActivityStarter.java
View File

@@ -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()