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

Commit 123fba9f authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

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

This reverts commit dc217b9d.

Reason for revert:

https://android-build.googleplex.com/builds/submitted/6448376/apps/latest/view/logs/build_error.log

Change-Id: I77fb257c216093c99b27484c2e3ac6da88c34d15
parent dc217b9d

services/core/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ 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

+0 −17
Original line number Diff line number Diff line
@@ -195,7 +195,6 @@ 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;
@@ -305,9 +304,7 @@ 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;
@@ -4651,11 +4648,6 @@ 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();
@@ -4664,18 +4656,11 @@ 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();
@@ -4684,8 +4669,6 @@ 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;

    }