diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-27 15:38:40 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-27 15:38:40 -0700 |
| commit | e1861133d51b9e6a6f658eb366630ad4f4d3ff8f (patch) | |
| tree | 046aaac6d455ccd57d38f3a13df44ecd13ac0322 /libs/ui/ISurfaceComposer.cpp | |
| parent | d91450e1169b3a57b3507fe86d947de05549f4ed (diff) | |
| parent | 3f2fd987b230740e1b28ccb541d1181cb2187ae6 (diff) | |
| download | frameworks_base-e1861133d51b9e6a6f658eb366630ad4f4d3ff8f.zip frameworks_base-e1861133d51b9e6a6f658eb366630ad4f4d3ff8f.tar.gz frameworks_base-e1861133d51b9e6a6f658eb366630ad4f4d3ff8f.tar.bz2 | |
Merge commit 'korg/cupcake'
Conflicts:
core/java/android/webkit/WebView.java
core/java/android/widget/TwoLineListItem.java
preloaded-classes
Diffstat (limited to 'libs/ui/ISurfaceComposer.cpp')
| -rw-r--r-- | libs/ui/ISurfaceComposer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/ui/ISurfaceComposer.cpp b/libs/ui/ISurfaceComposer.cpp index 0fea6f9..76597e1 100644 --- a/libs/ui/ISurfaceComposer.cpp +++ b/libs/ui/ISurfaceComposer.cpp @@ -96,12 +96,13 @@ public: return reply.readInt32(); } - virtual int setOrientation(DisplayID dpy, int orientation) + virtual int setOrientation(DisplayID dpy, int orientation, uint32_t flags) { Parcel data, reply; data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor()); data.writeInt32(dpy); data.writeInt32(orientation); + data.writeInt32(flags); remote()->transact(BnSurfaceComposer::SET_ORIENTATION, data, &reply); return reply.readInt32(); } @@ -184,7 +185,8 @@ status_t BnSurfaceComposer::onTransact( case SET_ORIENTATION: { DisplayID dpy = data.readInt32(); int orientation = data.readInt32(); - reply->writeInt32( setOrientation(dpy, orientation) ); + uint32_t flags = data.readInt32(); + reply->writeInt32( setOrientation(dpy, orientation, flags) ); } break; case FREEZE_DISPLAY: { DisplayID dpy = data.readInt32(); |