Merge "WindowOrientationListener: Check if proposed rotation is in range"

am: eb97eab212 Change-Id: I9179209d6817b6474114c0829ee8c0c36c93980c
2019-09-13 12:12:47 -07:00
parent 29a7524bdd eb97eab212
commit f40968bc1f
1 changed files with 7 additions and 1 deletions
--- a/services/core/java/com/android/server/policy/WindowOrientationListener.java
+++ b/services/core/java/com/android/server/policy/WindowOrientationListener.java
@@ -1047,8 +1047,14 @@ public abstract class WindowOrientationListener {
        @Override
        public void onSensorChanged(SensorEvent event) {
            int newRotation;
+
+            int reportedRotation = (int) event.values[0];
+            if (reportedRotation < 0 || reportedRotation > 3) {
+                return;
+            }
+
            synchronized (mLock) {
-                mDesiredRotation = (int) event.values[0];
+                mDesiredRotation = reportedRotation;
                newRotation = evaluateRotationChangeLocked();
            }
            if (newRotation >=0) {