am 461c4ba4: am bc3c1d98: am e9478f1b: Merge "Disable OrientationEventListener when activity backgrounded" into mnc-dev

* commit '461c4ba4c0c72d9c06c8089bd0fceb31e364625c':
  Disable OrientationEventListener when activity backgrounded

1 files changed, 9 insertions, 8 deletions

diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index 89e73439b..01ddac4ec 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -233,13 +233,6 @@ public class InCallActivity extends Activity implements FragmentDisplayManager {
             }
         };
 
-        if (mOrientationEventListener.canDetectOrientation()) {
-            Log.v(this, "Orientation detection enabled.");
-            mOrientationEventListener.enable();
-        } else {
-            Log.v(this, "Orientation detection disabled.");
-            mOrientationEventListener.disable();
-        }
         Log.d(this, "onCreate(): exit");
     }
 
@@ -259,6 +252,14 @@ public class InCallActivity extends Activity implements FragmentDisplayManager {
         Log.d(this, "onStart()...");
         super.onStart();
 
+        if (mOrientationEventListener.canDetectOrientation()) {
+            Log.v(this, "Orientation detection enabled.");
+            mOrientationEventListener.enable();
+        } else {
+            Log.v(this, "Orientation detection disabled.");
+            mOrientationEventListener.disable();
+        }
+
         // setting activity should be last thing in setup process
         InCallPresenter.getInstance().setActivity(this);
 
@@ -314,9 +315,9 @@ public class InCallActivity extends Activity implements FragmentDisplayManager {
     @Override
     protected void onStop() {
         Log.d(this, "onStop()...");
-
         InCallPresenter.getInstance().updateIsChangingConfigurations();
         InCallPresenter.getInstance().onActivityStopped();
+        mOrientationEventListener.disable();
         super.onStop();
     }