summaryrefslogtreecommitdiff
path: root/libs/hwui/Texture.h
diff options
context:
space:
mode:
author John Reck <jreck@google.com> 2015-07-21 22:00:50 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-07-21 22:00:50 +0000
commitc052a9a1bb1d0b7918f73166a36e96e0b1a9ed92 (patch)
treec5efd992b399b9c5222d9ddf3c0918056804d048 /libs/hwui/Texture.h
parenta48c0304bfc72dbf422382ced0a5b2705a7bfd9f (diff)
parenta2fd32348b06b22963fcc7c33179fddbd2394dbf (diff)
am a2fd3234: am 3bfe4b47: am 1cd5afc1: am 9317d0b9: am 1fddd3ef: Merge "Mark isInUse per-window" into mnc-dev
* commit 'a2fd32348b06b22963fcc7c33179fddbd2394dbf': Mark isInUse per-window
Diffstat (limited to 'libs/hwui/Texture.h')
-rw-r--r--libs/hwui/Texture.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/Texture.h b/libs/hwui/Texture.h
index 7227ce0dd24c..4bcd96dd32f7 100644
--- a/libs/hwui/Texture.h
+++ b/libs/hwui/Texture.h
@@ -97,7 +97,7 @@ public:
* Whether or not the Texture is marked in use and thus not evictable for
* the current frame. This is reset at the start of a new frame.
*/
- bool isInUse = false;
+ void* isInUse = nullptr;
private:
/**