Merge "Check HIDL call return values" (e66c233a) · Commits · e / os / android_frameworks_base

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

+2 −8

Original line number	Diff line number	Diff line
		@@ -182,7 +182,6 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
		private static final int INJECT_NTP_TIME = 5;
		// PSDS stands for Predicted Satellite Data Service
		private static final int DOWNLOAD_PSDS_DATA = 6;
		private static final int UPDATE_LOCATION = 7; // Handle external location from network listener
		private static final int DOWNLOAD_PSDS_DATA_FINISHED = 11;
		private static final int INITIALIZE_HANDLER = 13;
		private static final int REQUEST_LOCATION = 16;
		@@ -877,7 +876,7 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
		});
		}

		private void handleUpdateLocation(Location location) {
		private void injectLocation(Location location) {
		if (location.hasAccuracy()) {
		if (DEBUG) {
		Log.d(TAG, "injectLocation: " + location);
		@@ -2034,9 +2033,6 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
		case DOWNLOAD_PSDS_DATA_FINISHED:
		mDownloadPsdsDataPending = STATE_IDLE;
		break;
		case UPDATE_LOCATION:
		handleUpdateLocation((Location) msg.obj);
		break;
		case INITIALIZE_HANDLER:
		handleInitialize();
		break;
		@@ -2132,7 +2128,7 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
		public void onLocationChanged(Location location) {
		// this callback happens on mHandler looper
		if (LocationManager.NETWORK_PROVIDER.equals(location.getProvider())) {
		handleUpdateLocation(location);
		injectLocation(location);
		}
		}
		}
		@@ -2161,8 +2157,6 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
		return "DOWNLOAD_PSDS_DATA";
		case DOWNLOAD_PSDS_DATA_FINISHED:
		return "DOWNLOAD_PSDS_DATA_FINISHED";
		case UPDATE_LOCATION:
		return "UPDATE_LOCATION";
		case INITIALIZE_HANDLER:
		return "INITIALIZE_HANDLER";
		case REPORT_LOCATION:

services/core/jni/com_android_server_location_GnssLocationProvider.cpp

+206 −240

File changed.

Preview size limit exceeded, changes collapsed.