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

Merge "Sync with ISurfaceComposerClient changes"

Browse Source
This commit is contained in:
Huihong Luo
2022-04-13 20:36:38 +00:00
committed by Android (Google) Code Review
parent 3908fc64f9 36b55bc2ac
commit 283d08d68d
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/input/SpriteController.cpp
View File

@@ -249,8 +249,7 @@ void SpriteController::doUpdateSprites() {
// Pass cursor metadata in the sprite surface so that when Android is running as a
// client OS (e.g. ARC++) the host OS can get the requested cursor metadata and
// update mouse cursor in the host OS.
t.setMetadata(
update.state.surfaceControl, METADATA_MOUSE_CURSOR, p);
t.setMetadata(update.state.surfaceControl, gui::METADATA_MOUSE_CURSOR, p);
}
int32_t surfaceLayer = mOverlayLayer + update.state.layer;

9
native/android/surface_control.cpp
View File

@@ -80,7 +80,7 @@ ASurfaceControl* ASurfaceControl_createFromWindow(ANativeWindow* window, const c
Surface* surface = static_cast<Surface*>(window);
sp<IBinder> parentHandle = surface->getSurfaceControlHandle();
uint32_t flags = ISurfaceComposerClient::eFXSurfaceBufferState;
int32_t flags = ISurfaceComposerClient::eFXSurfaceBufferState;
sp<SurfaceControl> surfaceControl;
if (parentHandle) {
surfaceControl =
@@ -88,11 +88,8 @@ ASurfaceControl* ASurfaceControl_createFromWindow(ANativeWindow* window, const c
// Format is only relevant for buffer queue layers.
PIXEL_FORMAT_UNKNOWN /* format */, flags, parentHandle);
} else {
surfaceControl =
client->createWithSurfaceParent(String8(debug_name), 0 /* width */, 0 /* height */,
// Format is only relevant for buffer queue layers.
PIXEL_FORMAT_UNKNOWN /* format */, flags,
static_cast<Surface*>(window));
// deprecated, this should no longer be used
surfaceControl = nullptr;
}
if (!surfaceControl) {