summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorAdy Abraham <adyabr@google.com>2019-02-26 14:13:39 -0800
committerMichael Wright <michaelwr@google.com>2019-02-27 21:49:24 +0000
commit42f9a2fbbd754bcfe4d91db739f6f7aeea2069a7 (patch)
tree9641737d497d940e9269693cace69a5b04efb3d5 /core/java/android
parente4d662e470662507cd54ac36e150c5c1cf6cb809 (diff)
SurfaceControl: add getAllowedDisplayConfigs
expose ISurfaceComposer::getAllowedDisplayConfigs to SurfaceControl. Test: manual test to call getAllowedDisplayConfigs() from SurfaceControl observe config change. Bug: 122905403 Change-Id: I0587ac5ed2eb29788c2ce941d9c54ebfd215ddf9
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/view/SurfaceControl.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java
index ea7f31dd8507..3768acaaaad5 100644
--- a/core/java/android/view/SurfaceControl.java
+++ b/core/java/android/view/SurfaceControl.java
@@ -160,6 +160,7 @@ public final class SurfaceControl implements Parcelable {
private static native boolean nativeSetActiveConfig(IBinder displayToken, int id);
private static native boolean nativeSetAllowedDisplayConfigs(IBinder displayToken,
int[] allowedConfigs);
+ private static native int[] nativeGetAllowedDisplayConfigs(IBinder displayToken);
private static native int[] nativeGetDisplayColorModes(IBinder displayToken);
private static native SurfaceControl.DisplayPrimaries nativeGetDisplayNativePrimaries(
IBinder displayToken);
@@ -1538,6 +1539,16 @@ public final class SurfaceControl implements Parcelable {
/**
* @hide
*/
+ public static int[] getAllowedDisplayConfigs(IBinder displayToken) {
+ if (displayToken == null) {
+ throw new IllegalArgumentException("displayToken must not be null");
+ }
+ return nativeGetAllowedDisplayConfigs(displayToken);
+ }
+
+ /**
+ * @hide
+ */
public static int[] getDisplayColorModes(IBinder displayToken) {
if (displayToken == null) {
throw new IllegalArgumentException("displayToken must not be null");