Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Change to using sysprop for services.core.unboosted"" into rvc-dev am: 7811dc15ab

Browse Source 
Change-Id: I18dd75456dfe737084cc78bf11aceccd2e9d86ee
This commit is contained in:
Jeff Sharkey
2020-04-30 17:39:33 +00:00
committed by Automerger Merge Worker
parent cadc5803db 7811dc15ab
commit 4e90b707f1
2 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/Android.bp
View File

@@ -130,7 +130,6 @@ java_library_static {
"dnsresolver_aidl_interface-V4-java", "dnsresolver_aidl_interface-V4-java",
"netd_event_listener_interface-java", "netd_event_listener_interface-java",
"overlayable_policy_aidl-java", "overlayable_policy_aidl-java",
"SurfaceFlingerProperties",
], ],
} }

17
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -195,7 +195,6 @@ import android.provider.DeviceConfig;
import android.provider.Settings; import android.provider.Settings;
import android.service.vr.IVrManager; import android.service.vr.IVrManager;
import android.service.vr.IVrStateCallbacks; import android.service.vr.IVrStateCallbacks;
import android.sysprop.SurfaceFlingerProperties;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.ArraySet; import android.util.ArraySet;
@@ -305,9 +304,7 @@ import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Objects; import java.util.Objects;
import java.util.Optional;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
@@ -4689,11 +4686,6 @@ public class WindowManagerService extends IWindowManager.Stub
} }
private static boolean queryWideColorGamutSupport() { private static boolean queryWideColorGamutSupport() {
boolean defaultValue = false;
Optional<Boolean> hasWideColorProp = SurfaceFlingerProperties.has_wide_color_display();
if (hasWideColorProp.isPresent()) {
return hasWideColorProp.get();
}
try { try {
ISurfaceFlingerConfigs surfaceFlinger = ISurfaceFlingerConfigs.getService(); ISurfaceFlingerConfigs surfaceFlinger = ISurfaceFlingerConfigs.getService();
OptionalBool hasWideColor = surfaceFlinger.hasWideColorDisplay(); OptionalBool hasWideColor = surfaceFlinger.hasWideColorDisplay();
@@ -4702,18 +4694,11 @@ public class WindowManagerService extends IWindowManager.Stub
} }
} catch (RemoteException e) { } catch (RemoteException e) {
// Ignore, we're in big trouble if we can't talk to SurfaceFlinger's config store // Ignore, we're in big trouble if we can't talk to SurfaceFlinger's config store
} catch (NoSuchElementException e) {
return defaultValue;
} }
return false; return false;
} }
private static boolean queryHdrSupport() { private static boolean queryHdrSupport() {
boolean defaultValue = false;
Optional<Boolean> hasHdrProp = SurfaceFlingerProperties.has_HDR_display();
if (hasHdrProp.isPresent()) {
return hasHdrProp.get();
}
try { try {
ISurfaceFlingerConfigs surfaceFlinger = ISurfaceFlingerConfigs.getService(); ISurfaceFlingerConfigs surfaceFlinger = ISurfaceFlingerConfigs.getService();
OptionalBool hasHdr = surfaceFlinger.hasHDRDisplay(); OptionalBool hasHdr = surfaceFlinger.hasHDRDisplay();
@@ -4722,8 +4707,6 @@ public class WindowManagerService extends IWindowManager.Stub
} }
} catch (RemoteException e) { } catch (RemoteException e) {
// Ignore, we're in big trouble if we can't talk to SurfaceFlinger's config store // Ignore, we're in big trouble if we can't talk to SurfaceFlinger's config store
} catch (NoSuchElementException e) {
return defaultValue;
} }
return false; return false;
} }