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

Commit 4bb8ffb0 authored by Sundong Ahn's avatar Sundong Ahn
Browse files

Reland "Change to using sysprop for services.core.unboosted" 

This reverts commit 123fba9f.

Reason for revert: Fix build error (ag/11388833)

Bug: 124531214
Change-Id: If4810b59ba0665b7fec1329982800674297d891c
parent 123fba9f

services/core/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ java_library_static { 
        "dnsresolver_aidl_interface-V4-java",

        "netd_event_listener_interface-java",

        "overlayable_policy_aidl-java",

        "SurfaceFlingerProperties",

    ],

}

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

+17 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ import android.provider.DeviceConfig; 
import android.provider.Settings;

import android.service.vr.IVrManager;

import android.service.vr.IVrStateCallbacks;

import android.sysprop.SurfaceFlingerProperties;

import android.text.format.DateUtils;

import android.util.ArrayMap;

import android.util.ArraySet;
@@ -304,7 +305,9 @@ import java.util.Date; 
import java.util.HashMap;

import java.util.List;

import java.util.Map;

import java.util.NoSuchElementException;

import java.util.Objects;

import java.util.Optional;

import java.util.function.Function;

import java.util.function.Supplier;
@@ -4648,6 +4651,11 @@ public class WindowManagerService extends IWindowManager.Stub 
    }



    private static boolean queryWideColorGamutSupport() {

        boolean defaultValue = false;

        Optional<Boolean> hasWideColorProp = SurfaceFlingerProperties.has_wide_color_display();

        if (hasWideColorProp.isPresent()) {

            return hasWideColorProp.get();

        }

        try {

            ISurfaceFlingerConfigs surfaceFlinger = ISurfaceFlingerConfigs.getService();

            OptionalBool hasWideColor = surfaceFlinger.hasWideColorDisplay();
@@ -4656,11 +4664,18 @@ public class WindowManagerService extends IWindowManager.Stub 
            }

        } catch (RemoteException e) {

            // Ignore, we're in big trouble if we can't talk to SurfaceFlinger's config store

        } catch (NoSuchElementException e) {

            return defaultValue;

        }

        return false;

    }



    private static boolean queryHdrSupport() {

        boolean defaultValue = false;

        Optional<Boolean> hasHdrProp = SurfaceFlingerProperties.has_HDR_display();

        if (hasHdrProp.isPresent()) {

            return hasHdrProp.get();

        }

        try {

            ISurfaceFlingerConfigs surfaceFlinger = ISurfaceFlingerConfigs.getService();

            OptionalBool hasHdr = surfaceFlinger.hasHDRDisplay();
@@ -4669,6 +4684,8 @@ public class WindowManagerService extends IWindowManager.Stub 
            }

        } catch (RemoteException e) {

            // Ignore, we're in big trouble if we can't talk to SurfaceFlinger's config store

        } catch (NoSuchElementException e) {

            return defaultValue;

        }

        return false;

    }