diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2011-01-30 12:40:32 -0800 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2011-01-30 12:40:38 -0800 |
commit | b2abd8c424a68eb6a5e3615a99f66c0bd46e6063 (patch) | |
tree | ecc88a31068aa40c9244b2d88cdd06ad520fe617 /libs | |
parent | 3c89f6d1bd0821d0ae0205a5b48176156735aaac (diff) | |
parent | 43abedde5f714beff82dbb5e94425fce6c13b8cd (diff) | |
download | frameworks_base-b2abd8c424a68eb6a5e3615a99f66c0bd46e6063.zip frameworks_base-b2abd8c424a68eb6a5e3615a99f66c0bd46e6063.tar.gz frameworks_base-b2abd8c424a68eb6a5e3615a99f66c0bd46e6063.tar.bz2 |
Mass merge from gingerbread - do not merge
Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
Diffstat (limited to 'libs')
-rw-r--r-- | libs/surfaceflinger_client/ISurfaceComposer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/surfaceflinger_client/ISurfaceComposer.cpp b/libs/surfaceflinger_client/ISurfaceComposer.cpp index 2216824..01ae23f 100644 --- a/libs/surfaceflinger_client/ISurfaceComposer.cpp +++ b/libs/surfaceflinger_client/ISurfaceComposer.cpp @@ -266,13 +266,13 @@ status_t BnSurfaceComposer::onTransact( int32_t mode = data.readInt32(); status_t res = turnElectronBeamOff(mode); reply->writeInt32(res); - } + } break; case TURN_ELECTRON_BEAM_ON: { CHECK_INTERFACE(ISurfaceComposer, data, reply); int32_t mode = data.readInt32(); status_t res = turnElectronBeamOn(mode); reply->writeInt32(res); - } + } break; default: return BBinder::onTransact(code, data, reply, flags); } |