diff options
author | Mathias Agopian <mathias@google.com> | 2010-10-13 15:59:42 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-13 15:59:42 -0700 |
commit | 5bfa3a34eaef759c3ec4def76f646eb1c0bf997f (patch) | |
tree | db253b21d2e04cb6a1c74007eaf595d6edfbd864 /libs | |
parent | 27c7fb1a861776b4fdc2632697e4e25eee83617f (diff) | |
parent | 011b5bcc0355338b7ff906656282a54ffaa04b5a (diff) | |
download | frameworks_base-5bfa3a34eaef759c3ec4def76f646eb1c0bf997f.zip frameworks_base-5bfa3a34eaef759c3ec4def76f646eb1c0bf997f.tar.gz frameworks_base-5bfa3a34eaef759c3ec4def76f646eb1c0bf997f.tar.bz2 |
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 '011b5bcc0355338b7ff906656282a54ffaa04b5a' into gingerbread-plus-aosp
* commit '011b5bcc0355338b7ff906656282a54ffaa04b5a':
implement part of [3094280] New animation for screen on and screen off
Diffstat (limited to 'libs')
-rw-r--r-- | libs/surfaceflinger_client/ISurfaceComposer.cpp | 15 |
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); } |