From 6070ce1be356df378857504ea0e586da523034a5 Mon Sep 17 00:00:00 2001 From: Ady Abraham Date: Thu, 24 Jan 2019 18:48:58 -0800 Subject: SurfaceControl: add setAllowedDisplayConfigs expose ISurfaceComposer::setAllowedDisplayConfigs to SurfaceControl. This API is expected to be called by DisplayManager depends on the current policy in place. Once setAllowedDisplayConfigs is called, SF can only set a new display config if it is part of the allowed configurations list. Test: call setAllowedDisplayConfigs() from SurfaceControl and observe config change. Bug: 122905403 Change-Id: I7f8cc09dbec352701f5dcf2595bee66b8380bc00 --- core/java/android/view/SurfaceControl.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'core/java/android') diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java index aaf85aff2e8f..070cf110ac6f 100644 --- a/core/java/android/view/SurfaceControl.java +++ b/core/java/android/view/SurfaceControl.java @@ -157,6 +157,8 @@ public final class SurfaceControl implements Parcelable { IBinder displayToken, long numFrames, long timestamp); private static native int nativeGetActiveConfig(IBinder displayToken); private static native boolean nativeSetActiveConfig(IBinder displayToken, int id); + private static native boolean nativeSetAllowedDisplayConfigs(IBinder displayToken, + int[] allowedConfigs); private static native int[] nativeGetDisplayColorModes(IBinder displayToken); private static native SurfaceControl.DisplayPrimaries nativeGetDisplayNativePrimaries( IBinder displayToken); @@ -1518,6 +1520,20 @@ public final class SurfaceControl implements Parcelable { return nativeSetActiveConfig(displayToken, id); } + /** + * @hide + */ + public static boolean setAllowedDisplayConfigs(IBinder displayToken, int[] allowedConfigs) { + if (displayToken == null) { + throw new IllegalArgumentException("displayToken must not be null"); + } + if (allowedConfigs == null) { + throw new IllegalArgumentException("allowedConfigs must not be null"); + } + + return nativeSetAllowedDisplayConfigs(displayToken, allowedConfigs); + } + /** * @hide */ -- cgit v1.2.3