summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDan Stoza <stoza@google.com>2015-09-03 22:03:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-03 22:03:03 +0000
commitf090d5985a20f13433be632beb45af8a882c0cd0 (patch)
tree751a156a42f711a094af86c6f1d781b905b83ab1 /include
parent2f7531fb7a5d0c764c222f5acae0b487578629ab (diff)
parent3e4c8ccc3e5d037688ed8a1f8b69764c526e0d2f (diff)
downloadframeworks_native-f090d5985a20f13433be632beb45af8a882c0cd0.zip
frameworks_native-f090d5985a20f13433be632beb45af8a882c0cd0.tar.gz
frameworks_native-f090d5985a20f13433be632beb45af8a882c0cd0.tar.bz2
am 3e4c8ccc: Merge "SF: Add colorTransform to DisplayInfo" into mnc-dr-dev
* commit '3e4c8ccc3e5d037688ed8a1f8b69764c526e0d2f': SF: Add colorTransform to DisplayInfo
Diffstat (limited to 'include')
-rw-r--r--include/ui/DisplayInfo.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/ui/DisplayInfo.h b/include/ui/DisplayInfo.h
index 799944f..ad73ee7 100644
--- a/include/ui/DisplayInfo.h
+++ b/include/ui/DisplayInfo.h
@@ -36,6 +36,7 @@ struct DisplayInfo {
bool secure;
nsecs_t appVsyncOffset;
nsecs_t presentationDeadline;
+ int colorTransform;
};
/* Display orientations as defined in Surface.java and ISurfaceComposer.h. */