Merge "Register VolumeDialogControllerImpl with DumpManager." into tm-qpr-dev (81389920) · Commits · e / os / android_frameworks_base

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 =