Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b09322b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE: Always return non null from getGpsStatus" into rvc-dev

parents 37f00df5 d9df33d1

location/java/android/location/GpsStatus.java

+9 −0
Original line number Diff line number Diff line
@@ -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

+5 −0
Original line number Diff line number Diff line
@@ -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;

    }