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

Author: Jeff Brown

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 int rotationForOrientationLw(int orientation, int lastRotation) {
         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;