From 1e3b508bcaf859d71d84569c6ed46d59e9e02aa3 Mon Sep 17 00:00:00 2001
From: Evan Laird <evanlaird@google.com>
Date: Tue, 30 Jun 2020 20:11:45 -0400
Subject: [PATCH] Add CastController to DumpManager

It seems to have gone missing from when we transitioned it away from
Dependency. This CL adds it to DumpManager so we can see its state in
bug reports

Test: adb shell dumpsys activity service SystemUI | grep CastController
Bug: 158713111
Change-Id: I33266fbc983d54e20efd9ba64dfef38a0f4ab218
---
 .../android/systemui/statusbar/policy/CastControllerImpl.java | 4 +++-
 .../systemui/statusbar/policy/CastControllerImplTest.java     | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CastControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/CastControllerImpl.java
index da1ef2f0f6500..6106f38c0e603 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CastControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/CastControllerImpl.java
@@ -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()");
     }
 
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CastControllerImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CastControllerImplTest.java
index 016e402c69f41..db50163ce6a73 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CastControllerImplTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CastControllerImplTest.java
@@ -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