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

Commit 0bcdf2bf authored by Alison Cichowlas's avatar Alison Cichowlas Committed by Automerger Merge Worker
Browse files

Merge "Register VolumeDialogControllerImpl with DumpManager." into tm-qpr-dev... 

Merge "Register VolumeDialogControllerImpl with DumpManager." into tm-qpr-dev am: 81389920 am: b0fdc6b7

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



Change-Id: If960c07e8b36cdad08611b1caad5054561e34e2e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bf78d739 b0fdc6b7

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -66,6 +66,7 @@ import com.android.systemui.Dumpable; 
import com.android.systemui.R;

import com.android.systemui.R;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.keyguard.WakefulnessLifecycle;

import com.android.systemui.keyguard.WakefulnessLifecycle;

import com.android.systemui.plugins.VolumeDialogController;

import com.android.systemui.plugins.VolumeDialogController;

import com.android.systemui.qs.tiles.DndTile;

import com.android.systemui.qs.tiles.DndTile;
@@ -179,7 +180,8 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa 
            WakefulnessLifecycle wakefulnessLifecycle,

            WakefulnessLifecycle wakefulnessLifecycle,

            CaptioningManager captioningManager,

            CaptioningManager captioningManager,

            KeyguardManager keyguardManager,

            KeyguardManager keyguardManager,

            ActivityManager activityManager

            ActivityManager activityManager,

            DumpManager dumpManager

    ) {

    ) {

        mContext = context.getApplicationContext();

        mContext = context.getApplicationContext();

        mPackageManager = packageManager;

        mPackageManager = packageManager;
@@ -208,7 +210,7 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa 
        mCaptioningManager = captioningManager;

        mCaptioningManager = captioningManager;

        mKeyguardManager = keyguardManager;

        mKeyguardManager = keyguardManager;

        mActivityManager = activityManager;

        mActivityManager = activityManager;



        dumpManager.registerDumpable("VolumeDialogControllerImpl", this);





        boolean accessibilityVolumeStreamActive = accessibilityManager

        boolean accessibilityVolumeStreamActive = accessibilityManager

                .isAccessibilityVolumeStreamActive();

                .isAccessibilityVolumeStreamActive();

packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogControllerImplTest.java

+6 −2
Original line number Original line Diff line number Diff line
@@ -46,6 +46,7 @@ import androidx.test.filters.SmallTest; 




import com.android.systemui.SysuiTestCase;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.keyguard.WakefulnessLifecycle;

import com.android.systemui.keyguard.WakefulnessLifecycle;

import com.android.systemui.statusbar.VibratorHelper;

import com.android.systemui.statusbar.VibratorHelper;

import com.android.systemui.util.RingerModeLiveData;

import com.android.systemui.util.RingerModeLiveData;
@@ -99,6 +100,8 @@ public class VolumeDialogControllerImplTest extends SysuiTestCase { 
    private KeyguardManager mKeyguardManager;

    private KeyguardManager mKeyguardManager;

    @Mock

    @Mock

    private ActivityManager mActivityManager;

    private ActivityManager mActivityManager;

    @Mock

    private DumpManager mDumpManager;









    @Before

    @Before
@@ -121,7 +124,7 @@ public class VolumeDialogControllerImplTest extends SysuiTestCase { 
                mBroadcastDispatcher, mRingerModeTracker, mThreadFactory, mAudioManager,

                mBroadcastDispatcher, mRingerModeTracker, mThreadFactory, mAudioManager,

                mNotificationManager, mVibrator, mIAudioService, mAccessibilityManager,

                mNotificationManager, mVibrator, mIAudioService, mAccessibilityManager,

                mPackageManager, mWakefullnessLifcycle, mCaptioningManager, mKeyguardManager,

                mPackageManager, mWakefullnessLifcycle, mCaptioningManager, mKeyguardManager,

                mActivityManager, mCallback);

                mActivityManager, mDumpManager, mCallback);

        mVolumeController.setEnableDialogs(true, true);

        mVolumeController.setEnableDialogs(true, true);

    }

    }
@@ -202,11 +205,12 @@ public class VolumeDialogControllerImplTest extends SysuiTestCase { 
                CaptioningManager captioningManager,

                CaptioningManager captioningManager,

                KeyguardManager keyguardManager,

                KeyguardManager keyguardManager,

                ActivityManager activityManager,

                ActivityManager activityManager,

                DumpManager dumpManager,

                C callback) {

                C callback) {

            super(context, broadcastDispatcher, ringerModeTracker, theadFactory, audioManager,

            super(context, broadcastDispatcher, ringerModeTracker, theadFactory, audioManager,

                    notificationManager, optionalVibrator, iAudioService, accessibilityManager,

                    notificationManager, optionalVibrator, iAudioService, accessibilityManager,

                    packageManager, wakefulnessLifecycle, captioningManager, keyguardManager,

                    packageManager, wakefulnessLifecycle, captioningManager, keyguardManager,

                    activityManager);

                    activityManager, dumpManager);

            mCallbacks = callback;

            mCallbacks = callback;





            ArgumentCaptor<WakefulnessLifecycle.Observer> observerCaptor =

            ArgumentCaptor<WakefulnessLifecycle.Observer> observerCaptor =