Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alison Cichowlas
2022-10-03 13:08:51 +00:00
committed by Android (Google) Code Review
parent 6a2f4e2ab5 9602a1ad95
commit 8138992013
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java
View File

@@ -65,6 +65,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;
@@ -178,7 +179,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;
@@ -207,7 +209,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();

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

@@ -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 =