diff --git a/gnss/aidl/default/Android.bp b/gnss/aidl/default/Android.bp
index efe2953..d4b3da3 100644
--- a/gnss/aidl/default/Android.bp
+++ b/gnss/aidl/default/Android.bp
@@ -45,7 +45,7 @@
         "android.hardware.gnss.measurement_corrections@1.1",
         "android.hardware.gnss.measurement_corrections@1.0",
         "android.hardware.gnss.visibility_control@1.0",
-        "android.hardware.gnss-V5-ndk",
+        "android.hardware.gnss-V6-ndk",
     ],
     srcs: [
         "AGnssRil.cpp",
diff --git a/gnss/aidl/default/GnssAssistanceInterface.cpp b/gnss/aidl/default/GnssAssistanceInterface.cpp
index 2ef334c..5c8ee1d 100644
--- a/gnss/aidl/default/GnssAssistanceInterface.cpp
+++ b/gnss/aidl/default/GnssAssistanceInterface.cpp
@@ -35,9 +35,12 @@
 ndk::ScopedAStatus GnssAssistanceInterface::injectGnssAssistance(
         const GnssAssistance& gnssAssistance) {
     ALOGD("injectGnssAssistance. %s", gnssAssistance.toString().c_str());
-    if (gnssAssistance.gpsAssistance.satelliteEphemeris.size() == 0 &&
-        gnssAssistance.gpsAssistance.satelliteCorrections.size() == 0) {
-        ALOGE("Empty GnssAssistance");
+    if (!gnssAssistance.gpsAssistance) {
+        ALOGE("Empty GpsAssistance");
+        return ndk::ScopedAStatus::fromServiceSpecificError(IGnss::ERROR_INVALID_ARGUMENT);
+    }
+    if (gnssAssistance.gpsAssistance->satelliteEphemeris.size() == 0) {
+        ALOGE("Empty SatelliteEphemeris");
         return ndk::ScopedAStatus::fromServiceSpecificError(IGnss::ERROR_INVALID_ARGUMENT);
     }
     return ndk::ScopedAStatus::ok();
diff --git a/gnss/aidl/default/gnss-default.xml b/gnss/aidl/default/gnss-default.xml
index 700e240..27ab9c8 100644
--- a/gnss/aidl/default/gnss-default.xml
+++ b/gnss/aidl/default/gnss-default.xml
@@ -1,7 +1,7 @@
 <manifest version="1.0" type="device">
     <hal format="aidl">
         <name>android.hardware.gnss</name>
-        <version>5</version>
+        <version>6</version>
         <interface>
             <name>IGnss</name>
             <instance>default</instance>