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

Commit a4d410b7 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Toggle orientation sensor outside of WM lock" into tm-dev am: 89e92e9b am: 940cea36 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18027823



Change-Id: Ibb8624e596ca374bfc2635e37aef7c080d5e7471
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 38184bff 940cea36

services/core/java/com/android/server/wm/DisplayRotation.java

+23 −40
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ import android.os.SystemProperties; 
import android.os.UserHandle;

import android.provider.Settings;

import android.util.Slog;

import android.util.SparseArray;

import android.util.TimeUtils;

import android.util.proto.ProtoOutputStream;

import android.view.IDisplayWindowRotationCallback;
@@ -1024,13 +1023,7 @@ public class DisplayRotation { 
                disable = false;

                // Enable listener if not already enabled.

                if (!mOrientationListener.mEnabled) {

                    // Don't clear the current sensor orientation if the keyguard is going away in

                    // dismiss mode. This allows window manager to use the last sensor reading to

                    // determine the orientation vs. falling back to the last known orientation if

                    // the sensor reading was cleared which can cause it to relaunch the app that

                    // will show in the wrong orientation first before correcting leading to app

                    // launch delays.

                    mOrientationListener.enable(true /* clearCurrentRotation */);

                    mOrientationListener.enable();

                }

            }

        }
@@ -1570,35 +1563,13 @@ public class DisplayRotation { 
        proto.end(token);

    }



    private class OrientationListener extends WindowOrientationListener {

        final SparseArray<Runnable> mRunnableCache = new SparseArray<>(5);

        boolean mEnabled;

    private class OrientationListener extends WindowOrientationListener implements Runnable {

        transient boolean mEnabled;



        OrientationListener(Context context, Handler handler) {

            super(context, handler);

        }



        private class UpdateRunnable implements Runnable {

            final int mRotation;



            UpdateRunnable(int rotation) {

                mRotation = rotation;

            }



            @Override

            public void run() {

                // Send interaction power boost to improve redraw performance.

                mService.mPowerManagerInternal.setPowerBoost(Boost.INTERACTION, 0);

                if (isRotationChoicePossible(mCurrentAppOrientation)) {

                    final boolean isValid = isValidRotationChoice(mRotation);

                    sendProposedRotationChangeToStatusBarInternal(mRotation, isValid);

                } else {

                    mService.updateRotation(false /* alwaysSendConfiguration */,

                            false /* forceRelayout */);

                }

            }

        }



        @Override

        public boolean isKeyguardLocked() {

            return mService.isKeyguardLocked();
@@ -1615,27 +1586,39 @@ public class DisplayRotation { 
        @Override

        public void onProposedRotationChanged(int rotation) {

            ProtoLog.v(WM_DEBUG_ORIENTATION, "onProposedRotationChanged, rotation=%d", rotation);

            Runnable r = mRunnableCache.get(rotation, null);

            if (r == null) {

                r = new UpdateRunnable(rotation);

                mRunnableCache.put(rotation, r);

            // Send interaction power boost to improve redraw performance.

            mService.mPowerManagerInternal.setPowerBoost(Boost.INTERACTION, 0);

            if (isRotationChoicePossible(mCurrentAppOrientation)) {

                final boolean isValid = isValidRotationChoice(rotation);

                sendProposedRotationChangeToStatusBarInternal(rotation, isValid);

            } else {

                mService.updateRotation(false /* alwaysSendConfiguration */,

                        false /* forceRelayout */);

            }

            getHandler().post(r);

        }



        @Override

        public void enable(boolean clearCurrentRotation) {

            super.enable(clearCurrentRotation);

        public void enable() {

            mEnabled = true;

            getHandler().post(this);

            ProtoLog.v(WM_DEBUG_ORIENTATION, "Enabling listeners");

        }



        @Override

        public void disable() {

            super.disable();

            mEnabled = false;

            getHandler().post(this);

            ProtoLog.v(WM_DEBUG_ORIENTATION, "Disabling listeners");

        }



        @Override

        public void run() {

            if (mEnabled) {

                super.enable();

            } else {

                super.disable();

            }

        }

    }



    private class SettingsObserver extends ContentObserver {

services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java

+7 −2
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ public class DisplayRotationTests { 
    private void verifyOrientationListenerRegistration(int numOfInvocation) {

        final ArgumentCaptor<SensorEventListener> listenerCaptor = ArgumentCaptor.forClass(

                SensorEventListener.class);

        waitForUiHandler();

        verify(mMockSensorManager, times(numOfInvocation)).registerListener(

                listenerCaptor.capture(),

                same(mFakeSensor),
@@ -480,10 +481,14 @@ public class DisplayRotationTests { 
                SCREEN_ORIENTATION_UNSPECIFIED, Surface.ROTATION_0));

    }



    private boolean waitForUiHandler() throws Exception {

    private boolean waitForUiHandler() {

        final CountDownLatch latch = new CountDownLatch(1);

        UiThread.getHandler().post(latch::countDown);

        try {

            return latch.await(UI_HANDLER_WAIT_TIMEOUT_MS, TimeUnit.MILLISECONDS);

        } catch (InterruptedException ignored) {

        }

        throw new AssertionError("Failed to wait for ui handler");

    }



    @Test