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

Commit 99c3b4e8 authored by Ikram Gabiyev's avatar Ikram Gabiyev
Browse files

Make sysprop for PiP2 flag persist 

We are using a system property to easily
toggle the PiP2 flag during development.

However, the Core now caches the value
of the sysprop which means we have to do
adb reboot for flag change to take effect.
Hence the sysprop needs to be persistent.

Bug: 311462191
Test: adb shell setprop persist.wm_shell.pip2 1; adb reboot
Change-Id: Ia5ac78c1bdb41eaf28d7aaf727d17f3ff4225828
parent 6b591573

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;