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

Commit 30b497f8 authored by Jiaming Liu's avatar Jiaming Liu Committed by Automerger Merge Worker
Browse files

Merge "Fix IllegalStateException in DeviceStateManagerService" into udc-dev am: 01f04f3a 

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



Change-Id: I2f31ea06c5def93e7a75baa902b5d39e60fb5cf7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9ab8aef7 01f04f3a

services/core/java/com/android/server/devicestate/DeviceStateManagerService.java

+16 −14
Original line number Diff line number Diff line
@@ -391,12 +391,7 @@ public final class DeviceStateManagerService extends SystemService { 


            setRearDisplayStateLocked();



            if (!mPendingState.isPresent()) {

                // If the change in the supported states didn't result in a change of the pending

                // state commitPendingState() will never be called and the callbacks will never be

                // notified of the change.

            notifyDeviceStateInfoChangedAsync();

            }



            mHandler.post(this::notifyPolicyIfNeeded);

        }
@@ -460,12 +455,7 @@ public final class DeviceStateManagerService extends SystemService { 
            mOverrideRequestController.handleBaseStateChanged(identifier);

            updatePendingStateLocked();



            if (!mPendingState.isPresent()) {

                // If the change in base state didn't result in a change of the pending state

                // commitPendingState() will never be called and the callbacks will never be

                // notified of the change.

            notifyDeviceStateInfoChangedAsync();

            }



            mHandler.post(this::notifyPolicyIfNeeded);

        }
@@ -593,6 +583,18 @@ public final class DeviceStateManagerService extends SystemService { 


    private void notifyDeviceStateInfoChangedAsync() {

        synchronized (mLock) {

            if (mPendingState.isPresent()) {

                Slog.i(TAG,

                        "Cannot notify device state info change when pending state is present.");

                return;

            }



            if (!mBaseState.isPresent() || !mCommittedState.isPresent()) {

                Slog.e(TAG, "Cannot notify device state info change before the initial state has"

                        + " been committed.");

                return;

            }



            if (mProcessRecords.size() == 0) {

                return;

            }

services/tests/servicestests/src/com/android/server/devicestate/DeviceStateManagerServiceTest.java

+33 −3
Original line number Diff line number Diff line
@@ -88,6 +88,11 @@ public final class DeviceStateManagerServiceTest { 
        mProvider = new TestDeviceStateProvider();

        mPolicy = new TestDeviceStatePolicy(mProvider);

        mSysPropSetter = new TestSystemPropertySetter();

        setupDeviceStateManagerService();

        flushHandler(); // Flush the handler to ensure the initial values are committed.

    }



    private void setupDeviceStateManagerService() {

        mService = new DeviceStateManagerService(InstrumentationRegistry.getContext(), mPolicy,

                mSysPropSetter);
@@ -97,8 +102,6 @@ public final class DeviceStateManagerServiceTest { 
        when(mService.mActivityTaskManagerInternal.getTopApp())

                .thenReturn(mWindowProcessController);

        when(mWindowProcessController.getPid()).thenReturn(FAKE_PROCESS_ID);



        flushHandler(); // Flush the handler to ensure the initial values are committed.

    }



    private void flushHandler() {
@@ -324,6 +327,21 @@ public final class DeviceStateManagerServiceTest { 
                DEFAULT_DEVICE_STATE.getIdentifier());

    }



    @Test

    public void registerCallback_initialValueUnavailable() throws RemoteException {

        // Create a provider and a service without an initial base state.

        mProvider = new TestDeviceStateProvider(null /* initialState */);

        mPolicy = new TestDeviceStatePolicy(mProvider);

        setupDeviceStateManagerService();

        flushHandler(); // Flush the handler to ensure the initial values are committed.



        TestDeviceStateManagerCallback callback = new TestDeviceStateManagerCallback();

        mService.getBinderService().registerCallback(callback);

        flushHandler();

        // The callback should never be called when the base state is not set yet.

        assertNull(callback.getLastNotifiedInfo());

    }



    @Test

    public void requestState() throws RemoteException {

        TestDeviceStateManagerCallback callback = new TestDeviceStateManagerCallback();
@@ -939,8 +957,18 @@ public final class DeviceStateManagerServiceTest { 
                DEFAULT_DEVICE_STATE,

                OTHER_DEVICE_STATE,

                DEVICE_STATE_CANCEL_WHEN_REQUESTER_NOT_ON_TOP};



        @Nullable private final DeviceState mInitialState;

        private Listener mListener;



        private TestDeviceStateProvider() {

            this(DEFAULT_DEVICE_STATE);

        }



        private TestDeviceStateProvider(@Nullable DeviceState initialState) {

            mInitialState = initialState;

        }



        @Override

        public void setListener(Listener listener) {

            if (mListener != null) {
@@ -950,7 +978,9 @@ public final class DeviceStateManagerServiceTest { 
            mListener = listener;

            mListener.onSupportedDeviceStatesChanged(mSupportedDeviceStates,

                    SUPPORTED_DEVICE_STATES_CHANGED_INITIALIZED);

            mListener.onStateChanged(mSupportedDeviceStates[0].getIdentifier());

            if (mInitialState != null) {

                mListener.onStateChanged(mInitialState.getIdentifier());

            }

        }



        public void notifySupportedDeviceStates(DeviceState[] supportedDeviceStates) {