summaryrefslogtreecommitdiffstats
path: root/libs/surfaceflinger_client
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-10-15 08:33:43 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-15 08:33:43 -0700
commit99e3fab534d3a489726665cb8c71edecd5798b04 (patch)
tree86bb8ed74070ebc7bf2f92b0908a2c2959e25217 /libs/surfaceflinger_client
parenta4a2a3aaef730dbab020f7ece09149b05a399000 (diff)
parent5bfa3a34eaef759c3ec4def76f646eb1c0bf997f (diff)
downloadframeworks_base-99e3fab534d3a489726665cb8c71edecd5798b04.zip
frameworks_base-99e3fab534d3a489726665cb8c71edecd5798b04.tar.gz
frameworks_base-99e3fab534d3a489726665cb8c71edecd5798b04.tar.bz2
am 5bfa3a34: am 011b5bcc: Merge "implement part of [3094280] New animation for screen on and screen off add support for screen on animation" into gingerbread
Merge commit '5bfa3a34eaef759c3ec4def76f646eb1c0bf997f' * commit '5bfa3a34eaef759c3ec4def76f646eb1c0bf997f': implement part of [3094280] New animation for screen on and screen off
Diffstat (limited to 'libs/surfaceflinger_client')
-rw-r--r--libs/surfaceflinger_client/ISurfaceComposer.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/libs/surfaceflinger_client/ISurfaceComposer.cpp b/libs/surfaceflinger_client/ISurfaceComposer.cpp
index d72561f..969ee79 100644
--- a/libs/surfaceflinger_client/ISurfaceComposer.cpp
+++ b/libs/surfaceflinger_client/ISurfaceComposer.cpp
@@ -151,6 +151,15 @@ public:
return reply.readInt32();
}
+ virtual status_t turnElectronBeamOn(int32_t mode)
+ {
+ Parcel data, reply;
+ data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());
+ data.writeInt32(mode);
+ remote()->transact(BnSurfaceComposer::TURN_ELECTRON_BEAM_ON, data, &reply);
+ return reply.readInt32();
+ }
+
virtual void signal() const
{
Parcel data, reply;
@@ -239,6 +248,12 @@ status_t BnSurfaceComposer::onTransact(
status_t res = turnElectronBeamOff(mode);
reply->writeInt32(res);
}
+ case TURN_ELECTRON_BEAM_ON: {
+ CHECK_INTERFACE(ISurfaceComposer, data, reply);
+ int32_t mode = data.readInt32();
+ status_t res = turnElectronBeamOn(mode);
+ reply->writeInt32(res);
+ }
default:
return BBinder::onTransact(code, data, reply, flags);
}