diff options
author | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2015-10-27 15:38:07 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-10-27 15:38:07 +0000 |
commit | b53acd946d1a5dd819d2fc208176250ae636a699 (patch) | |
tree | 5afde96efee10d8083aae675c16c846601ee1646 | |
parent | 045cfb101119e5288bfcfbc433834f95a1b07a94 (diff) | |
parent | 7a4b1f97e0cc395aa423d56b48b2957d8f4fd486 (diff) | |
download | cts-b53acd946d1a5dd819d2fc208176250ae636a699.tar.gz |
Merge "Fix CameraManagerTest logic." into marshmallow-cts-dev
am: 7a4b1f97e0
* commit '7a4b1f97e0cc395aa423d56b48b2957d8f4fd486':
Fix CameraManagerTest logic.
-rw-r--r-- | tests/tests/hardware/src/android/hardware/camera2/cts/CameraManagerTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 77a0c8efb90..4c351886a8d 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 @@ public class CameraManagerTest extends AndroidTestCase { 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 @@ public class CameraManagerTest extends AndroidTestCase { 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); |