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

Commit 4aa1a3f1 authored Jul 15, 2020 by Soonil Nagarkar Committed by Automerger Merge Worker Jul 15, 2020

DO NOT MERGE: Always return non null from getGpsStatus am: d9df33d1 am: e2c88784

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

Change-Id: Id9cdb36e1d80834c403b6c2afdca3d149489f2de

parents 2408b165 e2c88784

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;
		}