1 files changed, 13 insertions, 4 deletions
diff --git a/tests/location/location_gnss/src/android/location/cts/gnss/GnssAntennaInfoTest.java b/tests/location/location_gnss/src/android/location/cts/gnss/GnssAntennaInfoTest.java
index b3d31415b35..0780a07bd5b 100644
--- a/tests/location/location_gnss/src/android/location/cts/gnss/GnssAntennaInfoTest.java
+++ b/tests/location/location_gnss/src/android/location/cts/gnss/GnssAntennaInfoTest.java
@@ -37,10 +37,11 @@ public class GnssAntennaInfoTest {
     private static final double CARRIER_FREQ_TOLERANCE_HZ = 10 * 1e6;
 
     private TestLocationManager mTestLocationManager;
+    private Context context;
 
     @Before
     public void setUp() throws Exception {
-        Context context = ApplicationProvider.getApplicationContext();
+        context = ApplicationProvider.getApplicationContext();
         mTestLocationManager = new TestLocationManager(context);
     }
 
@@ -97,11 +98,19 @@ public class GnssAntennaInfoTest {
                 LocationManager.GPS_PROVIDER, /* minTimeMs= */0, /* minDistanceM= */ 0, listener,
                 Looper.getMainLooper());
 
-        boolean success = testGnssStatusCallback.awaitStart();
+        boolean isAutomotiveDevice = TestMeasurementUtil.isAutomotiveDevice(context);
+        boolean success = true;
+        if(!isAutomotiveDevice){
+            success = testGnssStatusCallback.awaitStart();
+        }
         success = success ? testGnssStatusCallback.awaitStatus() : false;
-        success = success ? testGnssStatusCallback.awaitTtff() : false;
+        if(!isAutomotiveDevice){
+            success = success ? testGnssStatusCallback.awaitTtff() : false;
+        }
         mTestLocationManager.getLocationManager().removeUpdates(listener);
-        success = success ? testGnssStatusCallback.awaitStop() : false;
+        if(!isAutomotiveDevice){
+            success = success ? testGnssStatusCallback.awaitStop() : false;
+        }
         mTestLocationManager.unregisterGnssStatusCallback(testGnssStatusCallback);
 
         assertWithMessage(