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

Merge "Acquire DockManager via dagger" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-03 07:33:37 +00:00
committed by Android (Google) Code Review
parent ac4ca84d73 d93e95f8e2
commit 1bad5360b9
5 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/tests/src/com/android/keyguard/clock/ClockManagerTest.java
View File

@@ -84,7 +84,6 @@ public final class ClockManagerTest extends SysuiTestCase {
when(mMockInjectionInflationController.injectable(any())).thenReturn(inflater);
mFakeDockManager = new DockManagerFake();
getContext().putComponent(DockManager.class, mFakeDockManager);
mCurrentUser = new MutableLiveData<>();
mCurrentUser.setValue(MAIN_USER_ID);
@@ -92,7 +91,7 @@ public final class ClockManagerTest extends SysuiTestCase {
mClockManager = new ClockManager(getContext(), mMockInjectionInflationController,
mMockPluginManager, mMockColorExtractor, mMockContentResolver,
mMockCurrentUserObserable, mMockSettingsWrapper);
mMockCurrentUserObserable, mMockSettingsWrapper, mFakeDockManager);
mClockManager.addOnClockChangedListener(mMockListener1);
mClockManager.addOnClockChangedListener(mMockListener2);

2
packages/SystemUI/tests/src/com/android/systemui/doze/DozeDockHandlerTest.java
View File

@@ -73,8 +73,6 @@ public class DozeDockHandlerTest extends SysuiTestCase {
doReturn(false).when(mConfig).alwaysOnEnabled(anyInt());
mDockManagerFake = spy(new DockManagerFake());
mContext.putComponent(DockManager.class, mDockManagerFake);
mDockHandler = new DozeDockHandler(mContext, mMachine, mHost, mConfig,
Handler.createAsync(Looper.myLooper()), mDockManagerFake);
}

2
packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java
View File

@@ -38,7 +38,6 @@ import androidx.test.InstrumentationRegistry;
import androidx.test.filters.SmallTest;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.dock.DockManager;
import com.android.systemui.dock.DockManagerFake;
import com.android.systemui.statusbar.phone.DozeParameters;
import com.android.systemui.util.wakelock.WakeLock;
@@ -84,7 +83,6 @@ public class DozeTriggersTest extends SysuiTestCase {
mSensors = new FakeSensorManager(mContext);
mWakeLock = new WakeLockFake();
mDockManagerFake = spy(new DockManagerFake());
mContext.putComponent(DockManager.class, mDockManagerFake);
mTriggers = new DozeTriggers(mContext, mMachine, mHost, mAlarmManager, mConfig, mParameters,
mSensors, Handler.createAsync(Looper.myLooper()), mWakeLock, true,