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

Commit 8fa312bb authored by Nicolo' Mazzucato's avatar Nicolo' Mazzucato
Browse files

Avoid binder transaction to WM for lock orientation 

When rotation happened during a change of screen (e.g. on foldable devices), getRotationLockOrientation was blocked by a wm binder call to get the display size. wm was holding the lock while changing display power state. This cl removes this dependency.

Bug: 197515205
Test: Manual
Change-Id: I950e80289ea0f385bcaedf052d393ac7a23a14c6
parent 05474038

core/java/com/android/internal/view/RotationPolicy.java

+10 −14
Original line number Diff line number Diff line
@@ -20,15 +20,14 @@ import android.content.Context; 
import android.content.pm.PackageManager;

import android.content.res.Configuration;

import android.database.ContentObserver;

import android.graphics.Point;

import android.net.Uri;

import android.os.AsyncTask;

import android.os.Handler;

import android.os.RemoteException;

import android.os.UserHandle;

import android.provider.Settings;

import android.util.DisplayMetrics;

import android.util.Log;

import android.view.Display;

import android.view.IWindowManager;

import android.view.Surface;

import android.view.WindowManagerGlobal;
@@ -73,20 +72,17 @@ public final class RotationPolicy { 
     * otherwise Configuration.ORIENTATION_UNDEFINED if any orientation is lockable.

     */

    public static int getRotationLockOrientation(Context context) {

        if (!areAllRotationsAllowed(context)) {

            final Point size = new Point();

            final IWindowManager wm = WindowManagerGlobal.getWindowManagerService();

            try {

                final int displayId = context.getDisplayId();

                wm.getInitialDisplaySize(displayId, size);

                return size.x < size.y ?

                        Configuration.ORIENTATION_PORTRAIT : Configuration.ORIENTATION_LANDSCAPE;

            } catch (RemoteException e) {

                Log.w(TAG, "Unable to get the display size");

            }

        }

        if (areAllRotationsAllowed(context)) {

            return Configuration.ORIENTATION_UNDEFINED;

        }

        final DisplayMetrics metrics = context.getResources().getDisplayMetrics();

        final int rotation =

                context.getResources().getConfiguration().windowConfiguration.getRotation();

        final boolean rotated = rotation % 2 != 0;

        final int w = rotated ? metrics.heightPixels : metrics.widthPixels;

        final int h = rotated ? metrics.widthPixels : metrics.heightPixels;

        return w < h ? Configuration.ORIENTATION_PORTRAIT : Configuration.ORIENTATION_LANDSCAPE;

    }



    /**

     * Returns true if the rotation-lock toggle should be shown in system UI.