DO NOT MERGE: Always return non null from getGpsStatus am: d9df33d1c0 am: e2c8878455

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12160606

Change-Id: Id902f43f219ecc94fa054db611914f6ddc5b225f

location/java/android/location/GpsStatus.java

@@ -151,6 +151,15 @@ public final class GpsStatus {
         return status;
     }
 
+    /**
+     * Builds an empty GpsStatus.
+     *
+     * @hide
+     */
+    static GpsStatus createEmpty() {
+        return new GpsStatus();
+    }
+
     private GpsStatus() {
     }
 

location/java/android/location/LocationManager.java

@@ -1922,12 +1922,17 @@ public class LocationManager {
 
         GnssStatus gnssStatus = mGnssStatusListenerManager.getGnssStatus();
         int ttff = mGnssStatusListenerManager.getTtff();
+
+        // even though this method is marked nullable, there are legacy applications that expect
+        // this to never return null, so avoid breaking those apps
         if (gnssStatus != null) {
             if (status == null) {
                 status = GpsStatus.create(gnssStatus, ttff);
             } else {
                 status.setStatus(gnssStatus, ttff);
             }
+        } else if (status == null) {
+            status = GpsStatus.createEmpty();
         }
         return status;
     }