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

Merge "getDisplayDecorationSupport: return more detailed info"

Browse Source
This commit is contained in:
Leon Scroggins
2022-02-10 11:56:32 +00:00
committed by Android (Google) Code Review
parent b31ca5fa92 73e0689d8a
commit 4be1391e96
9 changed files with 84 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Android.bp
View File

@@ -109,6 +109,7 @@ filegroup {
":platform-compat-native-aidl",
// AIDL sources from external directories
":android.hardware.graphics.common-V3-java-source",
":android.hardware.security.keymint-V1-java-source",
":android.hardware.security.secureclock-V1-java-source",
":android.hardware.tv.tuner-V1-java-source",
@@ -288,6 +289,7 @@ java_defaults {
// TODO: remove when moved to the below package
"frameworks/base/packages/ConnectivityT/framework-t/aidl-export",
"packages/modules/Connectivity/framework/aidl-export",
"hardware/interfaces/graphics/common/aidl",
],
},
dxflags: [
@@ -537,6 +539,7 @@ stubs_defaults {
// TODO: remove when moved to the below package
"frameworks/base/packages/ConnectivityT/framework-t/aidl-export",
"packages/modules/Connectivity/framework/aidl-export",
"hardware/interfaces/graphics/common/aidl",
],
},
// These are libs from framework-internal-utils that are required (i.e. being referenced)

11
core/java/android/hardware/display/DisplayManager.java
View File

@@ -1213,17 +1213,6 @@ public final class DisplayManager {
mGlobal.setRefreshRateSwitchingType(newValue);
}
/**
* Returns whether the specified display supports DISPLAY_DECORATION.
*
* @param displayId The display to query support.
*
* @hide
*/
public boolean getDisplayDecorationSupport(int displayId) {
return mGlobal.getDisplayDecorationSupport(displayId);
}
/**
* Returns the user preference for "Match content frame rate".
* <p>

5
core/java/android/hardware/display/DisplayManagerGlobal.java
View File

@@ -32,6 +32,7 @@ import android.content.res.Resources;
import android.graphics.ColorSpace;
import android.graphics.Point;
import android.hardware.display.DisplayManager.DisplayListener;
import android.hardware.graphics.common.DisplayDecorationSupport;
import android.media.projection.IMediaProjection;
import android.media.projection.MediaProjection;
import android.os.Handler;
@@ -812,13 +813,13 @@ public final class DisplayManagerGlobal {
}
/**
* Report whether the display supports DISPLAY_DECORATION.
* Report whether/how the display supports DISPLAY_DECORATION.
*
* @param displayId The display whose support is being queried.
*
* @hide
*/
public boolean getDisplayDecorationSupport(int displayId) {
public DisplayDecorationSupport getDisplayDecorationSupport(int displayId) {
try {
return mDm.getDisplayDecorationSupport(displayId);
} catch (RemoteException ex) {

3
core/java/android/hardware/display/IDisplayManager.aidl
View File

@@ -22,6 +22,7 @@ import android.graphics.Point;
import android.hardware.display.BrightnessConfiguration;
import android.hardware.display.BrightnessInfo;
import android.hardware.display.Curve;
import android.hardware.graphics.common.DisplayDecorationSupport;
import android.hardware.display.IDisplayManagerCallback;
import android.hardware.display.IVirtualDisplayCallback;
import android.hardware.display.VirtualDisplayConfig;
@@ -183,5 +184,5 @@ interface IDisplayManager {
int getRefreshRateSwitchingType();
// Query for DISPLAY_DECORATION support.
boolean getDisplayDecorationSupport(int displayId);
DisplayDecorationSupport getDisplayDecorationSupport(int displayId);
}

14
core/java/android/view/Display.java
View File

@@ -42,6 +42,7 @@ import android.hardware.display.BrightnessInfo;
import android.hardware.display.DeviceProductInfo;
import android.hardware.display.DisplayManager;
import android.hardware.display.DisplayManagerGlobal;
import android.hardware.graphics.common.DisplayDecorationSupport;
import android.os.Build;
import android.os.Parcel;
import android.os.Parcelable;
@@ -1855,6 +1856,19 @@ public final class Display {
return refreshRate > 0.0f;
}
/**
* Returns whether/how the specified display supports DISPLAY_DECORATION.
*
* Composition.DISPLAY_DECORATION is a special layer type which is used to
* render the screen decorations (i.e. antialiased rounded corners and
* cutouts) while taking advantage of specific hardware.
*
* @hide
*/
public DisplayDecorationSupport getDisplayDecorationSupport() {
return mGlobal.getDisplayDecorationSupport(mDisplayId);
}
/**
* A mode supported by a given display.
*

12
core/java/android/view/SurfaceControl.java
View File

@@ -49,6 +49,7 @@ import android.hardware.HardwareBuffer;
import android.hardware.display.DeviceProductInfo;
import android.hardware.display.DisplayedContentSample;
import android.hardware.display.DisplayedContentSamplingAttributes;
import android.hardware.graphics.common.DisplayDecorationSupport;
import android.os.Build;
import android.os.IBinder;
import android.os.Parcel;
@@ -235,7 +236,8 @@ public final class SurfaceControl implements Parcelable {
float shadowRadius);
private static native void nativeSetGlobalShadowSettings(@Size(4) float[] ambientColor,
@Size(4) float[] spotColor, float lightPosY, float lightPosZ, float lightRadius);
private static native boolean nativeGetDisplayDecorationSupport(IBinder displayToken);
private static native DisplayDecorationSupport nativeGetDisplayDecorationSupport(
IBinder displayToken);
private static native void nativeSetFrameRate(long transactionObj, long nativeObject,
float frameRate, int compatibility, int changeFrameRateStrategy);
@@ -2694,16 +2696,18 @@ public final class SurfaceControl implements Parcelable {
}
/**
* Returns whether a display supports DISPLAY_DECORATION.
* Returns whether/how a display supports DISPLAY_DECORATION.
*
* @param displayToken
* The token for the display.
*
* @return Whether the display supports DISPLAY_DECORATION.
* @return A class describing how the display supports DISPLAY_DECORATION or null if it does
* not.
*
* TODO (b/218524164): Move this out of SurfaceControl.
* @hide
*/
public static boolean getDisplayDecorationSupport(IBinder displayToken) {
public static DisplayDecorationSupport getDisplayDecorationSupport(IBinder displayToken) {
return nativeGetDisplayDecorationSupport(displayToken);
}

45
core/jni/android_view_SurfaceControl.cpp
View File

@@ -245,6 +245,13 @@ static struct {
jmethodID onTransactionCommitted;
} gTransactionCommittedListenerClassInfo;
static struct {
jclass clazz;
jmethodID ctor;
jfieldID format;
jfieldID alphaInterpretation;
} gDisplayDecorationSupportInfo;
class JNamedColorSpace {
public:
// ColorSpace.Named.SRGB.ordinal() = 0;
@@ -1792,13 +1799,29 @@ static void nativeSetGlobalShadowSettings(JNIEnv* env, jclass clazz, jfloatArray
client->setGlobalShadowSettings(ambientColor, spotColor, lightPosY, lightPosZ, lightRadius);
}
static jboolean nativeGetDisplayDecorationSupport(JNIEnv* env, jclass clazz,
jobject displayTokenObject) {
static jobject nativeGetDisplayDecorationSupport(JNIEnv* env, jclass clazz,
jobject displayTokenObject) {
sp<IBinder> displayToken(ibinderForJavaObject(env, displayTokenObject));
if (displayToken == nullptr) {
return JNI_FALSE;
return nullptr;
}
return static_cast<jboolean>(SurfaceComposerClient::getDisplayDecorationSupport(displayToken));
const auto support = SurfaceComposerClient::getDisplayDecorationSupport(displayToken);
if (!support) {
return nullptr;
}
jobject jDisplayDecorationSupport =
env->NewObject(gDisplayDecorationSupportInfo.clazz, gDisplayDecorationSupportInfo.ctor);
if (jDisplayDecorationSupport == nullptr) {
jniThrowException(env, "java/lang/OutOfMemoryError", nullptr);
return nullptr;
}
env->SetIntField(jDisplayDecorationSupport, gDisplayDecorationSupportInfo.format,
static_cast<jint>(support.value().format));
env->SetIntField(jDisplayDecorationSupport, gDisplayDecorationSupportInfo.alphaInterpretation,
static_cast<jint>(support.value().alphaInterpretation));
return jDisplayDecorationSupport;
}
static jlong nativeGetHandle(JNIEnv* env, jclass clazz, jlong nativeObject) {
@@ -2131,7 +2154,8 @@ static const JNINativeMethod sSurfaceControlMethods[] = {
(void*)nativeMirrorSurface },
{"nativeSetGlobalShadowSettings", "([F[FFFF)V",
(void*)nativeSetGlobalShadowSettings },
{"nativeGetDisplayDecorationSupport", "(Landroid/os/IBinder;)Z",
{"nativeGetDisplayDecorationSupport",
"(Landroid/os/IBinder;)Landroid/hardware/graphics/common/DisplayDecorationSupport;",
(void*)nativeGetDisplayDecorationSupport},
{"nativeGetHandle", "(J)J",
(void*)nativeGetHandle },
@@ -2390,6 +2414,17 @@ int register_android_view_SurfaceControl(JNIEnv* env)
gTransactionCommittedListenerClassInfo.onTransactionCommitted =
GetMethodIDOrDie(env, transactionCommittedListenerClazz, "onTransactionCommitted",
"()V");
jclass displayDecorationSupportClazz =
FindClassOrDie(env, "android/hardware/graphics/common/DisplayDecorationSupport");
gDisplayDecorationSupportInfo.clazz = MakeGlobalRefOrDie(env, displayDecorationSupportClazz);
gDisplayDecorationSupportInfo.ctor =
GetMethodIDOrDie(env, displayDecorationSupportClazz, "<init>", "()V");
gDisplayDecorationSupportInfo.format =
GetFieldIDOrDie(env, displayDecorationSupportClazz, "format", "I");
gDisplayDecorationSupportInfo.alphaInterpretation =
GetFieldIDOrDie(env, displayDecorationSupportClazz, "alphaInterpretation", "I");
return err;
}

11
graphics/java/android/graphics/PixelFormat.java
View File

@@ -29,7 +29,7 @@ public class PixelFormat {
/** @hide */
@Retention(RetentionPolicy.SOURCE)
@IntDef({RGBA_8888, RGBX_8888, RGBA_F16, RGBA_1010102, RGB_888, RGB_565})
@IntDef({RGBA_8888, RGBX_8888, RGBA_F16, RGBA_1010102, RGB_888, RGB_565, R_8})
public @interface Format { }
// NOTE: these constants must match the values from graphics/common/x.x/types.hal
@@ -93,6 +93,9 @@ public class PixelFormat {
/** @hide */
public static final int HSV_888 = 0x37;
/** @hide */
public static final int R_8 = 0x38;
/**
* @deprecated use {@link android.graphics.ImageFormat#JPEG
* ImageFormat.JPEG} instead.
@@ -142,6 +145,10 @@ public class PixelFormat {
info.bitsPerPixel = 64;
info.bytesPerPixel = 8;
break;
case R_8:
info.bitsPerPixel = 8;
info.bytesPerPixel = 1;
break;
default:
throw new IllegalArgumentException("unknown pixel format " + format);
}
@@ -235,6 +242,8 @@ public class PixelFormat {
return "HSV_888";
case JPEG:
return "JPEG";
case R_8:
return "R_8";
default:
return Integer.toString(format);
}

7
services/core/java/com/android/server/display/DisplayManagerService.java
View File

@@ -78,6 +78,7 @@ import android.hardware.display.IDisplayManagerCallback;
import android.hardware.display.IVirtualDisplayCallback;
import android.hardware.display.VirtualDisplayConfig;
import android.hardware.display.WifiDisplayStatus;
import android.hardware.graphics.common.DisplayDecorationSupport;
import android.hardware.input.InputManagerInternal;
import android.media.projection.IMediaProjection;
import android.media.projection.IMediaProjectionManager;
@@ -1860,10 +1861,10 @@ public final class DisplayManagerService extends SystemService {
return mDisplayModeDirector.getModeSwitchingType();
}
private boolean getDisplayDecorationSupportInternal(int displayId) {
private DisplayDecorationSupport getDisplayDecorationSupportInternal(int displayId) {
final IBinder displayToken = getDisplayToken(displayId);
if (null == displayToken) {
return false;
return null;
}
return SurfaceControl.getDisplayDecorationSupport(displayToken);
}
@@ -3550,7 +3551,7 @@ public final class DisplayManagerService extends SystemService {
}
@Override // Binder call
public boolean getDisplayDecorationSupport(int displayId) {
public DisplayDecorationSupport getDisplayDecorationSupport(int displayId) {
final long token = Binder.clearCallingIdentity();
try {
return getDisplayDecorationSupportInternal(displayId);