Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98354974 authored by Brett Chabot's avatar Brett Chabot Committed by Android Git Automerger
Browse files

am 6ffce75f: am 154bb559: Merge "Fix PhoneWindowManager#getUserRotationMode" into jb-mr2-dev 

* commit '6ffce75f':
  Fix PhoneWindowManager#getUserRotationMode
parents 5c6370a4 6ffce75f

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+3 −2
Original line number Diff line number Diff line
@@ -4526,8 +4526,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 


    public int getUserRotationMode() {

        return Settings.System.getIntForUser(mContext.getContentResolver(),

                Settings.System.USER_ROTATION, WindowManagerPolicy.USER_ROTATION_FREE,

                UserHandle.USER_CURRENT);

                Settings.System.ACCELEROMETER_ROTATION, 0, UserHandle.USER_CURRENT) != 0 ?

                        WindowManagerPolicy.USER_ROTATION_FREE :

                                WindowManagerPolicy.USER_ROTATION_LOCKED;

    }



    // User rotation: to be used when all else fails in assigning an orientation to the device