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 am: 8138992013 am: b0fdc6b7af

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

Change-Id: If960c07e8b36cdad08611b1caad5054561e34e2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alison Cichowlas
2022-10-03 14:00:08 +00:00
committed by Automerger Merge Worker
parent bf78d739f1 b0fdc6b7af
commit 0bcdf2bf20
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

@@ -66,6 +66,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;
@@ -179,7 +180,8 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa
WakefulnessLifecycle wakefulnessLifecycle,
CaptioningManager captioningManager,
KeyguardManager keyguardManager,
ActivityManager activityManager
ActivityManager activityManager,
DumpManager dumpManager
) {
mContext = context.getApplicationContext();
mPackageManager = packageManager;
@@ -208,7 +210,7 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa
mCaptioningManager = captioningManager;
mKeyguardManager = keyguardManager;
mActivityManager = activityManager;
dumpManager.registerDumpable("VolumeDialogControllerImpl", this);
boolean accessibilityVolumeStreamActive = accessibilityManager
.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.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 =