diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-10-05 12:54:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-05 12:54:41 -0700 |
| commit | 38014763a2ceec005682066da01849adf95839bd (patch) | |
| tree | 85fa69bb159e80cb9ef23ba101bb9a47f656b955 /services | |
| parent | 54f9ac5880a33c8cd66ccb8930b175d1aca2a6f8 (diff) | |
| parent | 89230e3b7b9ec455373e3f60b62ff65589a9c57d (diff) | |
| download | frameworks_base-38014763a2ceec005682066da01849adf95839bd.zip frameworks_base-38014763a2ceec005682066da01849adf95839bd.tar.gz frameworks_base-38014763a2ceec005682066da01849adf95839bd.tar.bz2 | |
am 89230e3b: am 458fc5f5: Merge "Fix issue #3041660: Camera image flips upside down when rotating device" into gingerbread
Merge commit '89230e3b7b9ec455373e3f60b62ff65589a9c57d'
* commit '89230e3b7b9ec455373e3f60b62ff65589a9c57d':
Fix issue #3041660: Camera image flips upside down when rotating device
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/WindowManagerService.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java index ba3897d..30aed69 100644 --- a/services/java/com/android/server/WindowManagerService.java +++ b/services/java/com/android/server/WindowManagerService.java @@ -3387,11 +3387,8 @@ public class WindowManagerService extends IWindowManager.Stub } // If this application has requested an explicit orientation, // then use it. - if (or == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE || - or == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT || - or == ActivityInfo.SCREEN_ORIENTATION_SENSOR || - or == ActivityInfo.SCREEN_ORIENTATION_NOSENSOR || - or == ActivityInfo.SCREEN_ORIENTATION_USER) { + if (or != ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED + && or != ActivityInfo.SCREEN_ORIENTATION_BEHIND) { return or; } findingBehind |= (or == ActivityInfo.SCREEN_ORIENTATION_BEHIND); |