commit 34a018dcb0535d96dd8ae49c519ae157550607f4
author Tina Zhou <tinazh@google.com> Thu Oct 13 17:50:41 2016 +0000
committer Tina Zhou <tinazh@google.com> Thu Oct 13 17:50:41 2016 +0000
tree 5a12108c31dcf92080285dde57ce351a61bc45bf
parent 64047bfd787b8c91ddbb5d55261a2eb29d0d96cf

Revert "Fix for com.android.cts.verifier.location.GnssNavigationMessageTestsActivity"

This reverts commit 64047bfd787b8c91ddbb5d55261a2eb29d0d96cf.

Change-Id: Iddb87fd8d35fdfd7a31a00590e846cd4b6894d44

tests/tests/location/src/android/location/cts/TestMeasurementUtil.java

diff --git a/tests/tests/location/src/android/location/cts/TestMeasurementUtil.java b/tests/tests/location/src/android/location/cts/TestMeasurementUtil.java
index 2ce3ffb..0b2d875 100644
--- a/tests/tests/location/src/android/location/cts/TestMeasurementUtil.java
+++ b/tests/tests/location/src/android/location/cts/TestMeasurementUtil.java
@@ -684,15 +684,7 @@
                 int dataSize = message.getData().length;
                 softAssert.assertTrue("Data size: expected = 40, actual = " + dataSize,
                         dataSize == 40);
-            } else if (messageType == GnssNavigationMessage.TYPE_GLO_L1CA) {
-                int svid = message.getSvid();
-                softAssert.assertTrue("Space Vehicle ID : expected = [1, 24] or [93,107], actual = "
-                                svid,
-                        (svid >= 1 && svid <= 32) || ((svid >= 93 && svid <= 107)));
-                int dataSize = message.getData().length;
-                softAssert.assertTrue("Data size: expected = 11, actual = "  dataSize,
-                        dataSize == 11);
-             else {
+            } else {
                 Log.i(TAG, "GnssNavigationMessage (type = " + messageType
                         + ") skipped for verification.");
             }