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

Commit 42fc8d15 authored by Ikram Gabiyev's avatar Ikram Gabiyev Committed by Android (Google) Code Review
Browse files

Merge "Make sysprop for PiP2 flag persist" into main

parents 8831bf6e 99c3b4e8

libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipUtils.kt

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

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

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