diff options
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipUtils.kt | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityTaskManagerService.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipUtils.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipUtils.kt index dba0a985411d..579a7943829e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipUtils.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipUtils.kt @@ -152,7 +152,8 @@ object PipUtils { "org.chromium.arc", 0) val isTv = AppGlobals.getPackageManager().hasSystemFeature( PackageManager.FEATURE_LEANBACK, 0) - isPip2ExperimentEnabled = SystemProperties.getBoolean("wm_shell.pip2", false) || + isPip2ExperimentEnabled = SystemProperties.getBoolean( + "persist.wm_shell.pip2", false) || (Flags.enablePip2Implementation() && !isArc && !isTv) } return isPip2ExperimentEnabled as Boolean diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 237003a5fa10..3aa63af014c8 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -7418,7 +7418,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { FEATURE_LEANBACK); final boolean isArc = arcFeature != null && arcFeature.version >= 0; final boolean isTv = tvFeature != null && tvFeature.version >= 0; - sIsPip2ExperimentEnabled = SystemProperties.getBoolean("wm_shell.pip2", false) + sIsPip2ExperimentEnabled = SystemProperties.getBoolean( + "persist.wm_shell.pip2", false) || (Flags.enablePip2Implementation() && !isArc && !isTv); } return sIsPip2ExperimentEnabled; |