Merge "Revert "Do not use last app rotation as default."" into jb-mr1-dev

1 files changed, 1 insertions, 11 deletions

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index e37075f..2f2b7b0 100755
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -368,7 +368,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
     boolean mScreenOnEarly = false;
     boolean mScreenOnFully = false;
     boolean mOrientationSensorEnabled = false;
-    int mLastSensorRotation = -1;
     int mCurrentAppOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
     boolean mHasSoftInput = false;
     
@@ -3753,16 +3752,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
         synchronized (mLock) {
             int sensorRotation = mOrientationListener.getProposedRotation(); // may be -1
             if (sensorRotation < 0) {
-                // Sensor is disabled, device probably just turned off.
-                if (mLastSensorRotation >= 0) {
-                    sensorRotation = mLastSensorRotation;
-                } else {
-                    // Sensor has never been enabled. Last resort is to use lastRotation.
-                    sensorRotation = lastRotation;
-                }
-            } else {
-                // Valid sensor data, save it away.
-                mLastSensorRotation = sensorRotation;
+                sensorRotation = lastRotation;
             }
 
             final int preferredRotation;