Delete the assertion from PairedDevicesPanel

And delete the addPairedDevices parameters from the details panel
constructors because without that assertion they are unnecessary

Bug: Not applicable
Test: Not applicable
Change-Id: Ia73f7292e0fcbc8b727b07ba93df30111627a63e

6 files changed, 13 insertions, 18 deletions

diff --git a/device-manager/src/com/android/tools/idea/devicemanager/PairedDevicesPanel.java b/device-manager/src/com/android/tools/idea/devicemanager/PairedDevicesPanel.java
index 2644bd0c9e8..a4318634ccb 100644
--- a/device-manager/src/com/android/tools/idea/devicemanager/PairedDevicesPanel.java
+++ b/device-manager/src/com/android/tools/idea/devicemanager/PairedDevicesPanel.java
@@ -89,7 +89,6 @@ public final class PairedDevicesPanel extends JBPanel<PairedDevicesPanel> implem
 
   @UiThread
   private void createUi() {
-    ApplicationManager.getApplication().assertIsDispatchThread();
     removeAll();
 
     ToolbarDecorator toolbar;
diff --git a/device-manager/src/com/android/tools/idea/devicemanager/physicaltab/PhysicalDeviceDetailsPanel.java b/device-manager/src/com/android/tools/idea/devicemanager/physicaltab/PhysicalDeviceDetailsPanel.java
index 34ffa7a9cc3..f7eff8844b3 100644
--- a/device-manager/src/com/android/tools/idea/devicemanager/physicaltab/PhysicalDeviceDetailsPanel.java
+++ b/device-manager/src/com/android/tools/idea/devicemanager/physicaltab/PhysicalDeviceDetailsPanel.java
@@ -98,22 +98,19 @@ final class PhysicalDeviceDetailsPanel extends DetailsPanel {
   }
 
   PhysicalDeviceDetailsPanel(@NotNull PhysicalDevice device, @Nullable Project project) {
-    this(device, new AsyncDetailsBuilder(project, device).buildAsync(), true);
+    this(device, new AsyncDetailsBuilder(project, device).buildAsync());
   }
 
   @VisibleForTesting
-  PhysicalDeviceDetailsPanel(@NotNull PhysicalDevice device,
-                             @NotNull ListenableFuture<@NotNull PhysicalDevice> future,
-                             boolean addPairedDevices) {
-    this(device, future, SummarySectionCallback::new, WearPairingManager.INSTANCE, addPairedDevices);
+  PhysicalDeviceDetailsPanel(@NotNull PhysicalDevice device, @NotNull ListenableFuture<@NotNull PhysicalDevice> future) {
+    this(device, future, SummarySectionCallback::new, WearPairingManager.INSTANCE);
   }
 
   @VisibleForTesting
   PhysicalDeviceDetailsPanel(@NotNull PhysicalDevice device,
                              @NotNull ListenableFuture<@NotNull PhysicalDevice> future,
                              @NotNull NewInfoSectionCallback<@NotNull SummarySection> newSummarySectionCallback,
-                             @NotNull WearPairingManager manager,
-                             boolean addPairedDevices) {
+                             @NotNull WearPairingManager manager) {
     super(device.getName());
     myOnline = device.isOnline();
 
@@ -124,7 +121,7 @@ final class PhysicalDeviceDetailsPanel extends DetailsPanel {
       myInfoSections.add(mySummarySection);
       InfoSection.newPairedDeviceSection(device, manager).ifPresent(myInfoSections::add);
 
-      if (addPairedDevices && StudioFlags.PAIRED_DEVICES_TAB_ENABLED.get() && device.getType().equals(DeviceType.PHONE)) {
+      if (StudioFlags.PAIRED_DEVICES_TAB_ENABLED.get() && device.getType().equals(DeviceType.PHONE)) {
         myPairedDevicesPanel = new PairedDevicesPanel(device.getKey(), this);
       }
     }
diff --git a/device-manager/src/com/android/tools/idea/devicemanager/virtualtab/VirtualDeviceDetailsPanel.java b/device-manager/src/com/android/tools/idea/devicemanager/virtualtab/VirtualDeviceDetailsPanel.java
index c4309e31cb0..7c0b18998a5 100644
--- a/device-manager/src/com/android/tools/idea/devicemanager/virtualtab/VirtualDeviceDetailsPanel.java
+++ b/device-manager/src/com/android/tools/idea/devicemanager/virtualtab/VirtualDeviceDetailsPanel.java
@@ -55,11 +55,11 @@ final class VirtualDeviceDetailsPanel extends DetailsPanel {
   }
 
   VirtualDeviceDetailsPanel(@NotNull VirtualDevice device) {
-    this(device, WearPairingManager.INSTANCE, true);
+    this(device, WearPairingManager.INSTANCE);
   }
 
   @VisibleForTesting
-  VirtualDeviceDetailsPanel(@NotNull VirtualDevice device, @NotNull WearPairingManager manager, boolean addPairedDevices) {
+  VirtualDeviceDetailsPanel(@NotNull VirtualDevice device, @NotNull WearPairingManager manager) {
     super(device.getName());
     myDevice = device;
 
@@ -69,7 +69,7 @@ final class VirtualDeviceDetailsPanel extends DetailsPanel {
     myInfoSections.add(mySummarySection);
     InfoSection.newPairedDeviceSection(device, manager).ifPresent(myInfoSections::add);
 
-    if (addPairedDevices && StudioFlags.PAIRED_DEVICES_TAB_ENABLED.get()) {
+    if (StudioFlags.PAIRED_DEVICES_TAB_ENABLED.get()) {
       if ((device.getType() == DeviceType.PHONE && device.getAndroidVersion().getApiLevel() >= 30 && device.getAvdInfo().hasPlayStore())
           || device.getType() == DeviceType.WEAR_OS) {
         myPairedDevicesPanel = new PairedDevicesPanel(myDevice.getKey(), this);
diff --git a/device-manager/testSrc/com/android/tools/idea/devicemanager/physicaltab/PhysicalDeviceDetailsPanelTest.java b/device-manager/testSrc/com/android/tools/idea/devicemanager/physicaltab/PhysicalDeviceDetailsPanelTest.java
index 2e07b453b48..fc891c01bab 100644
--- a/device-manager/testSrc/com/android/tools/idea/devicemanager/physicaltab/PhysicalDeviceDetailsPanelTest.java
+++ b/device-manager/testSrc/com/android/tools/idea/devicemanager/physicaltab/PhysicalDeviceDetailsPanelTest.java
@@ -60,8 +60,7 @@ public final class PhysicalDeviceDetailsPanelTest {
     PhysicalDeviceDetailsPanel panel = new PhysicalDeviceDetailsPanel(TestPhysicalDevices.ONLINE_GOOGLE_PIXEL_3,
                                                                       future,
                                                                       section -> newSummarySectionCallback(section, latch),
-                                                                      WearPairingManager.INSTANCE,
-                                                                      false);
+                                                                      WearPairingManager.INSTANCE);
 
     // Assert
     CountDownLatchAssert.await(latch);
@@ -83,7 +82,7 @@ public final class PhysicalDeviceDetailsPanelTest {
   public void setInfoSectionPanelLayout() {
     // Act
     ListenableFuture<PhysicalDevice> future = Futures.immediateFuture(TestPhysicalDevices.GOOGLE_PIXEL_3);
-    DetailsPanel detailsPanel = new PhysicalDeviceDetailsPanel(TestPhysicalDevices.GOOGLE_PIXEL_3, future, false);
+    DetailsPanel detailsPanel = new PhysicalDeviceDetailsPanel(TestPhysicalDevices.GOOGLE_PIXEL_3, future);
 
     // Assert
     Container sectionPanel = detailsPanel.getInfoSectionPanel();
diff --git a/device-manager/testSrc/com/android/tools/idea/devicemanager/physicaltab/PhysicalDevicePanelTest.java b/device-manager/testSrc/com/android/tools/idea/devicemanager/physicaltab/PhysicalDevicePanelTest.java
index b7a394eb4cb..afcf51d2405 100644
--- a/device-manager/testSrc/com/android/tools/idea/devicemanager/physicaltab/PhysicalDevicePanelTest.java
+++ b/device-manager/testSrc/com/android/tools/idea/devicemanager/physicaltab/PhysicalDevicePanelTest.java
@@ -263,6 +263,6 @@ public final class PhysicalDevicePanelTest {
   }
 
   private static @NotNull DetailsPanel newPhysicalDeviceDetailsPanel(@NotNull PhysicalDevice device) {
-    return new PhysicalDeviceDetailsPanel(device, Futures.immediateFuture(TestPhysicalDevices.GOOGLE_PIXEL_3), false);
+    return new PhysicalDeviceDetailsPanel(device, Futures.immediateFuture(TestPhysicalDevices.GOOGLE_PIXEL_3));
   }
 }
diff --git a/device-manager/testSrc/com/android/tools/idea/devicemanager/virtualtab/VirtualDeviceDetailsPanelTest.java b/device-manager/testSrc/com/android/tools/idea/devicemanager/virtualtab/VirtualDeviceDetailsPanelTest.java
index a005b63299a..48dff111500 100644
--- a/device-manager/testSrc/com/android/tools/idea/devicemanager/virtualtab/VirtualDeviceDetailsPanelTest.java
+++ b/device-manager/testSrc/com/android/tools/idea/devicemanager/virtualtab/VirtualDeviceDetailsPanelTest.java
@@ -60,7 +60,7 @@ public final class VirtualDeviceDetailsPanelTest {
       .setAvdInfo(avdInfo)
       .build();
 
-    VirtualDeviceDetailsPanel panel = new VirtualDeviceDetailsPanel(device, WearPairingManager.INSTANCE, false);
+    VirtualDeviceDetailsPanel panel = new VirtualDeviceDetailsPanel(device, WearPairingManager.INSTANCE);
     SummarySection section = panel.getSummarySection();
 
     assertEquals("30", section.myApiLevelLabel.getText());
@@ -96,7 +96,7 @@ public final class VirtualDeviceDetailsPanelTest {
       .setAvdInfo(avdInfo)
       .build();
 
-    VirtualDeviceDetailsPanel panel = new VirtualDeviceDetailsPanel(device, WearPairingManager.INSTANCE, false);
+    VirtualDeviceDetailsPanel panel = new VirtualDeviceDetailsPanel(device, WearPairingManager.INSTANCE);
     SummarySection section = panel.getSummarySection();
 
     assertEquals("30", section.myApiLevelLabel.getText());