Refactor how layer metadata for use by VR is propagated
from WindowManager based on feedback in frameworks/base.
Since windowType and ownerUid are immutable, they are sent
on creation instead of separate IPC.
Bug: 30984984
Test: built locally
Change-Id: I380b3cdcf6aec471fc23f1e27846ab80492e8add
diff --git a/libs/gui/ISurfaceComposerClient.cpp b/libs/gui/ISurfaceComposerClient.cpp
index b2036dc..5a3fa04 100644
--- a/libs/gui/ISurfaceComposerClient.cpp
+++ b/libs/gui/ISurfaceComposerClient.cpp
@@ -56,8 +56,8 @@
virtual status_t createSurface(const String8& name, uint32_t width,
uint32_t height, PixelFormat format, uint32_t flags,
- const sp<IBinder>& parent, sp<IBinder>* handle,
- sp<IGraphicBufferProducer>* gbp) {
+ const sp<IBinder>& parent, uint32_t windowType, uint32_t ownerUid,
+ sp<IBinder>* handle, sp<IGraphicBufferProducer>* gbp) {
Parcel data, reply;
data.writeInterfaceToken(ISurfaceComposerClient::getInterfaceDescriptor());
data.writeString8(name);
@@ -65,6 +65,8 @@
data.writeUint32(height);
data.writeInt32(static_cast<int32_t>(format));
data.writeUint32(flags);
+ data.writeUint32(windowType);
+ data.writeUint32(ownerUid);
if (parent != nullptr) {
data.writeStrongBinder(parent);
}
@@ -148,6 +150,8 @@
uint32_t height = data.readUint32();
PixelFormat format = static_cast<PixelFormat>(data.readInt32());
uint32_t createFlags = data.readUint32();
+ uint32_t windowType = data.readUint32();
+ uint32_t ownerUid = data.readUint32();
sp<IBinder> parent = nullptr;
if (data.dataAvail() > 0) {
parent = data.readStrongBinder();
@@ -155,7 +159,7 @@
sp<IBinder> handle;
sp<IGraphicBufferProducer> gbp;
status_t result = createSurface(name, width, height, format,
- createFlags, parent, &handle, &gbp);
+ createFlags, parent, windowType, ownerUid, &handle, &gbp);
reply->writeStrongBinder(handle);
reply->writeStrongBinder(IInterface::asBinder(gbp));
reply->writeInt32(result);
diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp
index fbf76a1..bb552aa 100644
--- a/libs/gui/LayerState.cpp
+++ b/libs/gui/LayerState.cpp
@@ -43,8 +43,6 @@
output.writeStrongBinder(reparentHandle);
output.writeUint64(frameNumber);
output.writeInt32(overrideScalingMode);
- output.writeUint32(type);
- output.writeUint32(appid);
output.write(transparentRegion);
return NO_ERROR;
}
@@ -74,8 +72,6 @@
reparentHandle = input.readStrongBinder();
frameNumber = input.readUint64();
overrideScalingMode = input.readInt32();
- type = input.readUint32();
- appid = input.readUint32();
input.read(transparentRegion);
return NO_ERROR;
}
diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp
index ece07a3..ae81c8f 100644
--- a/libs/gui/SurfaceComposerClient.cpp
+++ b/libs/gui/SurfaceComposerClient.cpp
@@ -149,8 +149,6 @@
uint32_t w, uint32_t h);
status_t setLayer(const sp<SurfaceComposerClient>& client, const sp<IBinder>& id,
int32_t z);
- status_t setLayerInfo(const sp<SurfaceComposerClient>& client, const sp<IBinder>& id,
- uint32_t type, uint32_t appid);
status_t setFlags(const sp<SurfaceComposerClient>& client, const sp<IBinder>& id,
uint32_t flags, uint32_t mask);
status_t setTransparentRegionHint(
@@ -340,18 +338,6 @@
return NO_ERROR;
}
-status_t Composer::setLayerInfo(const sp<SurfaceComposerClient>& client,
- const sp<IBinder>& id, uint32_t type, uint32_t appid) {
- Mutex::Autolock _l(mLock);
- layer_state_t* s = getLayerStateLocked(client, id);
- if (!s)
- return BAD_INDEX;
- s->what |= layer_state_t::eLayerInfoChanged;
- s->type = type;
- s->appid = appid;
- return NO_ERROR;
-}
-
status_t Composer::setFlags(const sp<SurfaceComposerClient>& client,
const sp<IBinder>& id, uint32_t flags,
uint32_t mask) {
@@ -636,7 +622,9 @@
uint32_t h,
PixelFormat format,
uint32_t flags,
- SurfaceControl* parent)
+ SurfaceControl* parent,
+ uint32_t windowType,
+ uint32_t ownerUid)
{
sp<SurfaceControl> sur;
if (mStatus == NO_ERROR) {
@@ -648,7 +636,7 @@
parentHandle = parent->getHandle();
}
status_t err = mClient->createSurface(name, w, h, format, flags, parentHandle,
- &handle, &gbp);
+ windowType, ownerUid, &handle, &gbp);
ALOGE_IF(err, "SurfaceComposerClient::createSurface error %s", strerror(-err));
if (err == NO_ERROR) {
sur = new SurfaceControl(this, handle, gbp);
@@ -749,10 +737,6 @@
return getComposer().setLayer(this, id, z);
}
-status_t SurfaceComposerClient::setLayerInfo(const sp<IBinder>& id, uint32_t type, uint32_t appid) {
- return getComposer().setLayerInfo(this, id, type, appid);
-}
-
status_t SurfaceComposerClient::hide(const sp<IBinder>& id) {
return getComposer().setFlags(this, id,
layer_state_t::eLayerHidden,
diff --git a/libs/gui/SurfaceControl.cpp b/libs/gui/SurfaceControl.cpp
index 2d05b78..0362216 100644
--- a/libs/gui/SurfaceControl.cpp
+++ b/libs/gui/SurfaceControl.cpp
@@ -107,11 +107,6 @@
if (err < 0) return err;
return mClient->setLayer(mHandle, layer);
}
-status_t SurfaceControl::setLayerInfo(uint32_t type, uint32_t appid) {
- status_t err = validate();
- if (err < 0) return err;
- return mClient->setLayerInfo(mHandle, type, appid);
-}
status_t SurfaceControl::setPosition(float x, float y) {
status_t err = validate();
if (err < 0) return err;