diff options
| author | Chris Craik <ccraik@google.com> | 2016-07-11 21:28:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-11 21:28:23 +0000 |
| commit | ec83bd15c82d1983e764418139f65ef56761a52a (patch) | |
| tree | 2c6dc43452bb313f171d1a07bff4dc0ff11183f2 /libs/hwui/RenderProperties.h | |
| parent | 6ab97e587ed57f7aacb5d9e01554ac297481d7a0 (diff) | |
| parent | 272b82792590c75e57ec365672b7b3617c8c2edb (diff) | |
Merge \"Avoid throwing when 0 size layer requested\" into nyc-mr1-dev
am: 272b827925
Change-Id: Ibd3f90aea167b7ee0e1f9add327a651ba94c7883
Diffstat (limited to 'libs/hwui/RenderProperties.h')
| -rw-r--r-- | libs/hwui/RenderProperties.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libs/hwui/RenderProperties.h b/libs/hwui/RenderProperties.h index c1221f7f7981..6a6e8dbb3fcd 100644 --- a/libs/hwui/RenderProperties.h +++ b/libs/hwui/RenderProperties.h @@ -611,9 +611,7 @@ public: bool fitsOnLayer() const { const DeviceInfo* deviceInfo = DeviceInfo::get(); return mPrimitiveFields.mWidth <= deviceInfo->maxTextureSize() - && mPrimitiveFields.mHeight <= deviceInfo->maxTextureSize() - && mPrimitiveFields.mWidth > 0 - && mPrimitiveFields.mHeight > 0; + && mPrimitiveFields.mHeight <= deviceInfo->maxTextureSize(); } bool promotedToLayer() const { |