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

Commit 7a501d8d authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Add low-ram check for PiP support even if feature is enabled." into... 

Merge "Add low-ram check for PiP support even if feature is enabled." into oc-mr1-dev am: 94480521
am: f3a6edbb

Change-Id: I8053b4f99de86cf966abe52665bafafaf454f3fd
parents 9f4ff599 f3a6edbb

services/core/java/com/android/server/am/ActivityManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -13975,10 +13975,10 @@ public class ActivityManagerService extends IActivityManager.Stub 
                mContext.getPackageManager().hasSystemFeature(FEATURE_FREEFORM_WINDOW_MANAGEMENT)

                        || Settings.Global.getInt(

                                resolver, DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, 0) != 0;

        final boolean supportsPictureInPicture =

                mContext.getPackageManager().hasSystemFeature(FEATURE_PICTURE_IN_PICTURE);















        final boolean supportsMultiWindow = ActivityManager.supportsMultiWindow(mContext);













        final boolean supportsPictureInPicture = supportsMultiWindow &&













                mContext.getPackageManager().hasSystemFeature(FEATURE_PICTURE_IN_PICTURE);















        final boolean supportsSplitScreenMultiWindow =















                ActivityManager.supportsSplitScreenMultiWindow(mContext);















        final boolean supportsMultiDisplay = mContext.getPackageManager()