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

Merge "Add CastController to DumpManager"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-07-02 02:53:25 +00:00
committed by Android (Google) Code Review
parent f627c04344 1e3b508bca
commit 54cb7ac7ea
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/policy/CastControllerImpl.java
View File

@@ -35,6 +35,7 @@ import androidx.annotation.VisibleForTesting;
import com.android.internal.annotations.GuardedBy;
import com.android.systemui.R;
import com.android.systemui.dump.DumpManager;
import com.android.systemui.util.Utils;
import java.io.FileDescriptor;
@@ -68,7 +69,7 @@ public class CastControllerImpl implements CastController {
private MediaProjectionInfo mProjection;
@Inject
public CastControllerImpl(Context context) {
public CastControllerImpl(Context context, DumpManager dumpManager) {
mContext = context;
mMediaRouter = (MediaRouter) context.getSystemService(Context.MEDIA_ROUTER_SERVICE);
mMediaRouter.setRouterGroupId(MediaRouter.MIRRORING_GROUP_ID);
@@ -76,6 +77,7 @@ public class CastControllerImpl implements CastController {
context.getSystemService(Context.MEDIA_PROJECTION_SERVICE);
mProjection = mProjectionManager.getActiveProjectionInfo();
mProjectionManager.addCallback(mProjectionCallback, new Handler());
dumpManager.registerDumpable(TAG, this);
if (DEBUG) Log.d(TAG, "new CastController()");
}

3
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CastControllerImplTest.java
View File

@@ -17,6 +17,7 @@ import android.testing.TestableLooper;
import androidx.test.filters.SmallTest;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.dump.DumpManager;
import com.android.systemui.statusbar.policy.CastController.Callback;
import org.junit.Before;
@@ -51,7 +52,7 @@ public class CastControllerImplTest extends SysuiTestCase {
mContext.addMockSystemService(MediaProjectionManager.class, mMediaProjectionManager);
when(mMediaProjectionManager.getActiveProjectionInfo()).thenReturn(mProjection);
mController = new CastControllerImpl(mContext);
mController = new CastControllerImpl(mContext, mock(DumpManager.class));
}
@Test