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

Commit d62b9a23 authored by Hani Kazmi's avatar Hani Kazmi Committed by Android (Google) Code Review
Browse files

Merge changes from topic "asm-flag-fix" 

* changes:
  Update asm logging version to 2.
  Update activity-security feature flag string
parents da5eb059 c3daaeb0

services/core/java/com/android/server/wm/ActivitySecurityModelFeatureFlags.java

+6 −3
Original line number Diff line number Diff line
@@ -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;

services/core/java/com/android/server/wm/ActivityStarter.java

+1 −1
Original line number Diff line number Diff line
@@ -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()