commit ef5bc8043a5fe63de8069c1022cb4884c699ecf3
author Yu-Han Yang <yuhany@google.com> Sat Jan 20 01:19:34 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jan 20 01:19:34 2024 +0000
tree 9ba068f0ba47517ec7ae23e51bf6b09434a2e468
parent 41e3d35e8ac70d32fb4a5c3e4f02c054f88609a5
parent 76519950eba9983b5d3bb11c7562c64254549538

Merge "Drop invalid GNSS location instead of crash" into main

services/core/java/com/android/server/location/gnss/GnssLocationProvider.java

diff --git a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
index 9c4225d..39df5be 100644
--- a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
@@ -1384,7 +1384,8 @@
         try {
             reportLocation(LocationResult.wrap(location).validate());
         } catch (BadLocationException e) {
-            throw new IllegalArgumentException(e);
+            Log.e(TAG, "Dropping invalid location: " + e);
+            return;
         }
 
         if (mStarted) {
@@ -1759,7 +1760,8 @@
             try {
                 reportLocation(LocationResult.wrap(locations).validate());
             } catch (BadLocationException e) {
-                throw new IllegalArgumentException(e);
+                Log.e(TAG, "Dropping invalid locations: " + e);
+                return;
             }
         }