Bug 776132 - When the gonk AppShell is trying to shut down the OrientationObserver, don't call OrientationObserver::GetInstance() -- that might /create/ an orientation observer! r=cjones

--HG--
extra : rebase_source : 72ad44ea6edf1c170cb0af6fb3e207550c7bee15

widget/gonk/OrientationObserver.cpp

@@ -183,6 +183,18 @@ OrientationObserver::~OrientationObserver()
   }
 }
 
+/* static */ void
+OrientationObserver::ShutDown()
+{
+  if (!sOrientationSensorObserver) {
+    return;
+  }
+
+  if (sOrientationSensorObserver->mAutoOrientationEnabled) {
+    sOrientationSensorObserver->DisableAutoOrientation();
+  }
+}
+
 void
 OrientationObserver::Notify(const hal::SensorData& aSensorData)
 {

widget/gonk/OrientationObserver.h

@@ -37,6 +37,10 @@ public:
   OrientationObserver();
   ~OrientationObserver();
 
+  // Call DisableAutoOrientation on the existing OrientatiOnobserver singleton,
+  // if it exists.  If no OrientationObserver exists, do nothing.
+  static void ShutDown();
+
   // Notification from sensor.
   void Notify(const SensorData& aSensorData);
 

widget/gonk/nsAppShell.cpp

@@ -529,7 +529,7 @@ nsAppShell::Init()
 NS_IMETHODIMP
 nsAppShell::Exit()
 {
-  OrientationObserver::GetInstance()->DisableAutoOrientation();
+  OrientationObserver::ShutDown();
   return nsBaseAppShell::Exit();
 }