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

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

Merge "Use sysproperties to check PiP2 flag for dev" into main

parents 26724a4c 3717eb05

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

+3 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.app.WindowConfiguration 
import android.content.ComponentName

import android.content.Context

import android.os.RemoteException

import android.os.SystemProperties

import android.util.DisplayMetrics

import android.util.Log

import android.util.Pair
@@ -137,5 +138,6 @@ object PipUtils { 


    @JvmStatic

    val isPip2ExperimentEnabled: Boolean

        get() = Flags.enablePip2Implementation()

        get() = Flags.enablePip2Implementation() || SystemProperties.getBoolean(

                "wm_shell.pip2", false)

}
 
 No newline at end of file

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

+2 −1
Original line number Diff line number Diff line
@@ -7401,6 +7401,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
    }



    static boolean isPip2ExperimentEnabled() {

        return Flags.enablePip2Implementation();

        return Flags.enablePip2Implementation() || SystemProperties.getBoolean(

                "wm_shell.pip2", false);

    }

}