diff options
| author | Chris Craik <ccraik@google.com> | 2016-07-12 02:16:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-12 02:16:05 +0000 |
| commit | 52c4eba143ce88a231e2691f65abd076f9e21c18 (patch) | |
| tree | 24f0aaac06b23b38125a89f2e7b8781c7958c2b0 /libs/hwui/RenderProperties.h | |
| parent | b334d64371440576285f98f87906bf2f066bb446 (diff) | |
| parent | ec83bd15c82d1983e764418139f65ef56761a52a (diff) | |
Merge \\"Avoid throwing when 0 size layer requested\\" into nyc-mr1-dev am: 272b827925
am: ec83bd15c8
Change-Id: If585ade667c888d2f5f8e90a76125971178a7ba5
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 2a2e4c765c83..00494a12b808 100644 --- a/libs/hwui/RenderProperties.h +++ b/libs/hwui/RenderProperties.h @@ -612,9 +612,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 { |