Bug 787532 - Update Android HAL backend to take into account new scre…

…en lock values. r=jlebar
mozilla-spidermonkey · Sep 11, 2012 · 8aefc62 · 8aefc62
1 parent 203d87d
commit 8aefc62
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/hal/android/AndroidHal.cpp b/hal/android/AndroidHal.cpp
@@ -185,8 +185,19 @@ LockScreenOrientation(const ScreenOrientation& aOrientation)
     return false;
   }
 
-  bridge->LockScreenOrientation(aOrientation);
-  return true;
+  switch (aOrientation) {
+    // The Android backend only supports these orientations.
+    case eScreenOrientation_PortraitPrimary:
+    case eScreenOrientation_PortraitSecondary:
+    case eScreenOrientation_Portrait:
+    case eScreenOrientation_LandscapePrimary:
+    case eScreenOrientation_LandscapeSecondary:
+    case eScreenOrientation_Landscape:
+      bridge->LockScreenOrientation(aOrientation);
+      return true;
+    default:
+      return false;
+  }
 }
 
 void

diff --git a/widget/gonk/OrientationObserver.cpp b/widget/gonk/OrientationObserver.cpp
@@ -283,8 +283,10 @@ OrientationObserver::DisableAutoOrientation()
 bool
 OrientationObserver::LockScreenOrientation(ScreenOrientation aOrientation)
 {
-  MOZ_ASSERT(eScreenOrientation_None < aOrientation &&
-             aOrientation < eScreenOrientation_EndGuard);
+  MOZ_ASSERT(aOrientation | (eScreenOrientation_PortraitPrimary |
+                             eScreenOrientation_PortraitSecondary |
+                             eScreenOrientation_LandscapePrimary |
+                             eScreenOrientation_LandscapeSecondary));
 
   // Enable/disable the observer depending on 1. multiple orientations
   // allowed, and 2. observer enabled.