Add setOverrideScalingMode to SurfaceControl
Provide an interface for the window manager to override
the client specified scaling mode. This makes it possible
for the window manager to force windows to be scaleable
for animations, etc, even when a resize is pending.
Bug: 27891386
Change-Id: Ic4aae9917bd6869ee0dbb425979b4e21c68342a3
diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp
index e43342e..d1c576e 100644
--- a/libs/gui/LayerState.cpp
+++ b/libs/gui/LayerState.cpp
@@ -41,6 +41,7 @@
output.write(finalCrop);
output.writeStrongBinder(handle);
output.writeUint64(frameNumber);
+ output.writeInt32(overrideScalingMode);
output.write(transparentRegion);
return NO_ERROR;
}
@@ -68,6 +69,7 @@
input.read(finalCrop);
handle = input.readStrongBinder();
frameNumber = input.readUint64();
+ overrideScalingMode = input.readInt32();
input.read(transparentRegion);
return NO_ERROR;
}
diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp
index 418892a..e33cc37 100644
--- a/libs/gui/SurfaceComposerClient.cpp
+++ b/libs/gui/SurfaceComposerClient.cpp
@@ -163,6 +163,8 @@
status_t deferTransactionUntil(const sp<SurfaceComposerClient>& client,
const sp<IBinder>& id, const sp<IBinder>& handle,
uint64_t frameNumber);
+ status_t setOverrideScalingMode(const sp<SurfaceComposerClient>& client,
+ const sp<IBinder>& id, int32_t overrideScalingMode);
void setDisplaySurface(const sp<IBinder>& token,
const sp<IGraphicBufferProducer>& bufferProducer);
@@ -414,6 +416,33 @@
return NO_ERROR;
}
+status_t Composer::setOverrideScalingMode(
+ const sp<SurfaceComposerClient>& client,
+ const sp<IBinder>& id, int32_t overrideScalingMode) {
+ Mutex::Autolock lock(mLock);
+ layer_state_t* s = getLayerStateLocked(client, id);
+ if (!s) {
+ return BAD_INDEX;
+ }
+
+ switch (overrideScalingMode) {
+ case NATIVE_WINDOW_SCALING_MODE_FREEZE:
+ case NATIVE_WINDOW_SCALING_MODE_SCALE_TO_WINDOW:
+ case NATIVE_WINDOW_SCALING_MODE_SCALE_CROP:
+ case NATIVE_WINDOW_SCALING_MODE_NO_SCALE_CROP:
+ case -1:
+ break;
+ default:
+ ALOGE("unknown scaling mode: %d",
+ overrideScalingMode);
+ return BAD_VALUE;
+ }
+
+ s->what |= layer_state_t::eOverrideScalingModeChanged;
+ s->overrideScalingMode = overrideScalingMode;
+ return NO_ERROR;
+}
+
// ---------------------------------------------------------------------------
DisplayState& Composer::getDisplayStateLocked(const sp<IBinder>& token) {
@@ -650,6 +679,12 @@
return getComposer().deferTransactionUntil(this, id, handle, frameNumber);
}
+status_t SurfaceComposerClient::setOverrideScalingMode(
+ const sp<IBinder>& id, int32_t overrideScalingMode) {
+ return getComposer().setOverrideScalingMode(
+ this, id, overrideScalingMode);
+}
+
// ----------------------------------------------------------------------------
void SurfaceComposerClient::setDisplaySurface(const sp<IBinder>& token,
diff --git a/libs/gui/SurfaceControl.cpp b/libs/gui/SurfaceControl.cpp
index 184de71..314d83a 100644
--- a/libs/gui/SurfaceControl.cpp
+++ b/libs/gui/SurfaceControl.cpp
@@ -165,6 +165,12 @@
return mClient->deferTransactionUntil(mHandle, handle, frameNumber);
}
+status_t SurfaceControl::setOverrideScalingMode(int32_t overrideScalingMode) {
+ status_t err = validate();
+ if (err < 0) return err;
+ return mClient->setOverrideScalingMode(mHandle, overrideScalingMode);
+}
+
status_t SurfaceControl::clearLayerFrameStats() const {
status_t err = validate();
if (err < 0) return err;