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

Commit af5d7937 authored by Will Leshner's avatar Will Leshner
Browse files

No longer awaken dream when showing global actions dialog. 

The call to awaken from dream was needed when dreams lived in a floating
window. Now that they live in their own activity, they no longer float
above the global actions dialog and so killing the dream is not
necessary. Not killing the dream fixes issues with glanceable hub.

Bug: 351892094
Test: GlobalActionsDialogLiteTest
Flag: EXEMPT bugfix
Change-Id: Icf36e427efc64735a79914ea26e15f8eea9d6236
parent 732fe397

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java

+0 −17
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ import android.os.Trace; 
import android.os.UserHandle;

import android.os.UserManager;

import android.provider.Settings;

import android.service.dreams.IDreamManager;

import android.sysprop.TelephonyProperties;

import android.telecom.TelecomManager;

import android.telephony.ServiceState;
@@ -197,7 +196,6 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene 
    private final Context mContext;

    private final GlobalActionsManager mWindowManagerFuncs;

    private final AudioManager mAudioManager;

    private final IDreamManager mDreamManager;

    private final DevicePolicyManager mDevicePolicyManager;

    private final LockPatternUtils mLockPatternUtils;

    private final SelectedUserInteractor mSelectedUserInteractor;
@@ -345,7 +343,6 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene 
            Context context,

            GlobalActionsManager windowManagerFuncs,

            AudioManager audioManager,

            IDreamManager iDreamManager,

            DevicePolicyManager devicePolicyManager,

            LockPatternUtils lockPatternUtils,

            BroadcastDispatcher broadcastDispatcher,
@@ -382,7 +379,6 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene 
        mContext = context;

        mWindowManagerFuncs = windowManagerFuncs;

        mAudioManager = audioManager;

        mDreamManager = iDreamManager;

        mDevicePolicyManager = devicePolicyManager;

        mLockPatternUtils = lockPatternUtils;

        mTelephonyListenerManager = telephonyListenerManager;
@@ -510,20 +506,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene 
        mHandler.sendEmptyMessage(MESSAGE_DISMISS);

    }



    protected void awakenIfNecessary() {

        if (mDreamManager != null) {

            try {

                if (mDreamManager.isDreaming()) {

                    mDreamManager.awaken();

                }

            } catch (RemoteException e) {

                // we tried

            }

        }

    }



    protected void handleShow(@Nullable Expandable expandable) {

        awakenIfNecessary();

        mDialog = createDialog();

        prepareDialog();

packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogLiteTest.java

+0 −3
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import android.media.AudioManager; 
import android.os.Handler;

import android.os.UserManager;

import android.provider.Settings;

import android.service.dreams.IDreamManager;

import android.testing.TestableLooper;

import android.view.GestureDetector;

import android.view.IWindowManager;
@@ -106,7 +105,6 @@ public class GlobalActionsDialogLiteTest extends SysuiTestCase { 


    @Mock private GlobalActions.GlobalActionsManager mWindowManagerFuncs;

    @Mock private AudioManager mAudioManager;

    @Mock private IDreamManager mDreamManager;

    @Mock private DevicePolicyManager mDevicePolicyManager;

    @Mock private LockPatternUtils mLockPatternUtils;

    @Mock private BroadcastDispatcher mBroadcastDispatcher;
@@ -165,7 +163,6 @@ public class GlobalActionsDialogLiteTest extends SysuiTestCase { 
        mGlobalActionsDialogLite = new GlobalActionsDialogLite(mContext,

                mWindowManagerFuncs,

                mAudioManager,

                mDreamManager,

                mDevicePolicyManager,

                mLockPatternUtils,

                mBroadcastDispatcher,