diff options
| author | Mathias Agopian <mathias@google.com> | 2011-01-18 11:26:51 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-18 11:26:51 -0800 |
| commit | 4707dc73e236b7055644401b73cd30164b7ad157 (patch) | |
| tree | b629d782a7b6662d089508eb7df9ccab24e49864 /libs | |
| parent | 97ac293507bfa2913e115f736df3dfd91230a232 (diff) | |
| parent | 72abf01a8b6958ac1f86d36302a8462c4f51fd9d (diff) | |
| download | frameworks_base-4707dc73e236b7055644401b73cd30164b7ad157.zip frameworks_base-4707dc73e236b7055644401b73cd30164b7ad157.tar.gz frameworks_base-4707dc73e236b7055644401b73cd30164b7ad157.tar.bz2 | |
am 72abf01a: Merge "Fix the ISurfaceComposer onTransact switch." into gingerbread
* commit '72abf01a8b6958ac1f86d36302a8462c4f51fd9d':
Fix the ISurfaceComposer onTransact switch.
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 969ee79..a2a5455 100644 --- a/libs/surfaceflinger_client/ISurfaceComposer.cpp +++ b/libs/surfaceflinger_client/ISurfaceComposer.cpp @@ -247,13 +247,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); } |