summaryrefslogtreecommitdiffstats
path: root/services/surfaceflinger/SurfaceFlinger.h
diff options
context:
space:
mode:
authorMichael Lentine <mlentine@google.com>2014-07-30 17:52:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-30 16:17:51 +0000
commit99c7dc596adeef45604a596075043e1f37daf7ca (patch)
tree573aa0ffe8f11b0c4c1380541d7af9d0eac039b0 /services/surfaceflinger/SurfaceFlinger.h
parentcd36eb445bcc55c88e157584d9ac229280459463 (diff)
parent6c9e34a98a63033b80bd1c24c7aa1304f912f10a (diff)
downloadframeworks_native-99c7dc596adeef45604a596075043e1f37daf7ca.zip
frameworks_native-99c7dc596adeef45604a596075043e1f37daf7ca.tar.gz
frameworks_native-99c7dc596adeef45604a596075043e1f37daf7ca.tar.bz2
Merge "Modified SurfaceFlinger to implment setActiveConfig and getActiveConfig." into lmp-dev
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.h')
-rw-r--r--services/surfaceflinger/SurfaceFlinger.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index 476e549..5ae3d0b 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -239,6 +239,8 @@ private:
// called on the main thread in response to initializeDisplays()
void onInitializeDisplays();
+ // called on the main thread in response to setActiveConfig()
+ void setActiveConfigInternal(const sp<DisplayDevice>& hw, int mode);
// called on the main thread in response to setPowerMode()
void setPowerModeInternal(const sp<DisplayDevice>& hw, int mode);