commit b53acd946d1a5dd819d2fc208176250ae636a699
author Przemyslaw Szczepaniak <pszczepaniak@google.com> Tue Oct 27 15:38:07 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 27 15:38:07 2015 +0000
tree 5afde96efee10d8083aae675c16c846601ee1646
parent 045cfb101119e5288bfcfbc433834f95a1b07a94
parent 7a4b1f97e0cc395aa423d56b48b2957d8f4fd486

Merge "Fix CameraManagerTest logic." into marshmallow-cts-dev
am: 7a4b1f97e0

* commit '7a4b1f97e0cc395aa423d56b48b2957d8f4fd486':
  Fix CameraManagerTest logic.

tests/tests/hardware/src/android/hardware/camera2/cts/CameraManagerTest.java

diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/CameraManagerTest.java b/tests/tests/hardware/src/android/hardware/camera2/cts/CameraManagerTest.java
index 77a0c8e..4c35188 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/CameraManagerTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/CameraManagerTest.java
@@ -534,7 +534,7 @@
                     java.util.concurrent.TimeUnit.MILLISECONDS);
             assertTrue(String.format("Received unavailability notice for wrong ID " +
                             "(expected %s, got %s)", id, candidateId),
-                    id == candidateId);
+                    id.equals(candidateId));
             assertTrue("Availability events received unexpectedly",
                     availableEventQueue.size() == 0);
 
@@ -549,7 +549,7 @@
                     java.util.concurrent.TimeUnit.MILLISECONDS);
             assertTrue(String.format("Received availability notice for wrong ID " +
                             "(expected %s, got %s)", id, candidateId),
-                    id == candidateId);
+                    id.equals(candidateId));
             assertTrue("Unavailability events received unexpectedly",
                     unavailableEventQueue.size() == 0);