diff options
| author | Mathias Agopian <mathias@google.com> | 2011-01-27 11:24:33 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-27 11:24:33 -0800 |
| commit | 50f7830c55a1b23f5d8f9339987b444f4491caf7 (patch) | |
| tree | 5de3c4c01c03fd14df0c798318db560fd80ab407 /libs | |
| parent | fb69e0c0ffbb403da7f8e05454605d6caec503d0 (diff) | |
| parent | 72abf01a8b6958ac1f86d36302a8462c4f51fd9d (diff) | |
| download | frameworks_base-50f7830c55a1b23f5d8f9339987b444f4491caf7.zip frameworks_base-50f7830c55a1b23f5d8f9339987b444f4491caf7.tar.gz frameworks_base-50f7830c55a1b23f5d8f9339987b444f4491caf7.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 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); } |