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

Commit 9602a1ad authored by Alison Cichowlas's avatar Alison Cichowlas
Browse files

Register VolumeDialogControllerImpl with DumpManager. 

Bug: 249345341
Test: adb shell dumpsys activity service SystemUI | grep VolumeDialogControllerImpl: (including final colon) has results
Change-Id: I4eb92b55e835d78814c62a77408eabfe08f34dbf
parent 354ad8b4

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

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

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.keyguard.WakefulnessLifecycle;

import com.android.systemui.plugins.VolumeDialogController;

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

            CaptioningManager captioningManager,

            KeyguardManager keyguardManager,

            ActivityManager activityManager

            ActivityManager activityManager,

            DumpManager dumpManager

    ) {

        mContext = context.getApplicationContext();

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

        mKeyguardManager = keyguardManager;

        mActivityManager = activityManager;



        dumpManager.registerDumpable("VolumeDialogControllerImpl", this);



        boolean accessibilityVolumeStreamActive = accessibilityManager

                .isAccessibilityVolumeStreamActive();

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

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


import com.android.systemui.SysuiTestCase;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.keyguard.WakefulnessLifecycle;

import com.android.systemui.statusbar.VibratorHelper;

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

    @Mock

    private ActivityManager mActivityManager;

    @Mock

    private DumpManager mDumpManager;





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

                mNotificationManager, mVibrator, mIAudioService, mAccessibilityManager,

                mPackageManager, mWakefullnessLifcycle, mCaptioningManager, mKeyguardManager,

                mActivityManager, mCallback);

                mActivityManager, mDumpManager, mCallback);

        mVolumeController.setEnableDialogs(true, true);

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

                KeyguardManager keyguardManager,

                ActivityManager activityManager,

                DumpManager dumpManager,

                C callback) {

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

                    notificationManager, optionalVibrator, iAudioService, accessibilityManager,

                    packageManager, wakefulnessLifecycle, captioningManager, keyguardManager,

                    activityManager);

                    activityManager, dumpManager);

            mCallbacks = callback;



            ArgumentCaptor<WakefulnessLifecycle.Observer> observerCaptor =