diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsProfilesControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsProfilesControllerTest.java
index c7330787913..234be88aaf6 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsProfilesControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsProfilesControllerTest.java
@@ -108,7 +108,7 @@ public class UsbDetailsProfilesControllerTest {
         List<SwitchPreference> switches = getProfileSwitches();
 
         for (int i = 0; i < switches.size(); i++) {
-            assertThat(switches.get(i).getKey().equals(mOptions.get(i)));
+            assertThat(switches.get(i).getKey()).isEqualTo(mOptions.get(i));
         }
     }
 
@@ -138,8 +138,8 @@ public class UsbDetailsProfilesControllerTest {
         mDetailsProfilesController.refresh(UsbBackend.MODE_DATA_MTP);
         List<SwitchPreference> switches = getProfileSwitches();
 
-        assertThat(switches.get(0).getKey().equals(UsbManager.USB_FUNCTION_MTP));
-        assertThat(switches.get(0).isChecked());
+        assertThat(switches.get(0).getKey()).isEqualTo(UsbManager.USB_FUNCTION_MTP);
+        assertThat(switches.get(0).isChecked()).isTrue();
     }
 
     @Test
@@ -153,9 +153,9 @@ public class UsbDetailsProfilesControllerTest {
         List<SwitchPreference> switches = getProfileSwitches();
 
         assertThat(switches.get(0).getKey()).isEqualTo(UsbManager.USB_FUNCTION_MTP);
-        assertThat(switches.get(0).isChecked());
+        assertThat(switches.get(0).isChecked()).isTrue();
         assertThat(switches.get(3).getKey()).isEqualTo(UsbDetailsProfilesController.KEY_POWER);
-        assertThat(switches.get(3).isChecked());
+        assertThat(switches.get(3).isChecked()).isTrue();
     }
 
     @Test
@@ -171,7 +171,7 @@ public class UsbDetailsProfilesControllerTest {
 
         assertThat(switches.get(0).getKey()).isEqualTo(UsbManager.USB_FUNCTION_MTP);
         verify(mUsbBackend).setMode(UsbBackend.MODE_DATA_MTP);
-        assertThat(switches.get(0).isChecked());
+        assertThat(switches.get(0).isChecked()).isTrue();
     }
 
     @Test
@@ -188,9 +188,9 @@ public class UsbDetailsProfilesControllerTest {
 
         assertThat(switches.get(0).getKey()).isEqualTo(UsbManager.USB_FUNCTION_MTP);
         verify(mUsbBackend).setMode(UsbBackend.MODE_DATA_MTP | UsbBackend.MODE_POWER_SOURCE);
-        assertThat(switches.get(0).isChecked());
+        assertThat(switches.get(0).isChecked()).isTrue();
         assertThat(switches.get(3).getKey()).isEqualTo(UsbDetailsProfilesController.KEY_POWER);
-        assertThat(switches.get(3).isChecked());
+        assertThat(switches.get(3).isChecked()).isTrue();
     }
 
     @Test
@@ -207,9 +207,10 @@ public class UsbDetailsProfilesControllerTest {
 
         assertThat(switches.get(0).getKey()).isEqualTo(UsbManager.USB_FUNCTION_MTP);
         verify(mUsbBackend).setMode(UsbBackend.MODE_DATA_MTP);
-        assertThat(switches.get(0).isChecked());
+        mDetailsProfilesController.refresh(UsbBackend.MODE_DATA_MTP);
+        assertThat(switches.get(0).isChecked()).isTrue();
         assertThat(switches.get(1).getKey()).isEqualTo(UsbManager.USB_FUNCTION_PTP);
-        assertThat(!switches.get(1).isChecked());
+        assertThat(switches.get(1).isChecked()).isFalse();
     }
 
     @Test
@@ -226,7 +227,7 @@ public class UsbDetailsProfilesControllerTest {
 
         assertThat(switches.get(0).getKey()).isEqualTo(UsbManager.USB_FUNCTION_MTP);
         verify(mUsbBackend).setMode(UsbBackend.MODE_DATA_NONE);
-        assertThat(!switches.get(0).isChecked());
+        assertThat(switches.get(0).isChecked()).isFalse();
     }
 
     @Test