Fix crash in Volantis because there is not FLP support. (beea442e) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/LocationManagerService.java

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -482,8 +482,11 @@ public class LocationManagerService extends ILocationManager.Stub {
	}		}

	// bind to fused hardware provider if supported		// bind to fused hardware provider if supported
	FlpHardwareProvider flpHardwareProvider = FlpHardwareProvider.getInstance(mContext);		// in devices without support, requesting an instance of FlpHardwareProvider will raise an
			// exception, so make sure we only do that when supported
			FlpHardwareProvider flpHardwareProvider;
	if (FlpHardwareProvider.isSupported()) {		if (FlpHardwareProvider.isSupported()) {
			flpHardwareProvider = FlpHardwareProvider.getInstance(mContext);
	FusedProxy fusedProxy = FusedProxy.createAndBind(		FusedProxy fusedProxy = FusedProxy.createAndBind(
	mContext,		mContext,
	mLocationHandler,		mLocationHandler,
	@@ -495,6 +498,7 @@ public class LocationManagerService extends ILocationManager.Stub {
	Slog.e(TAG, "Unable to bind FusedProxy.");		Slog.e(TAG, "Unable to bind FusedProxy.");
	}		}
	} else {		} else {
			flpHardwareProvider = null;
	Slog.e(TAG, "FLP HAL not supported");		Slog.e(TAG, "FLP HAL not supported");
	}		}

	@@ -505,7 +509,7 @@ public class LocationManagerService extends ILocationManager.Stub {
	com.android.internal.R.array.config_locationProviderPackageNames,		com.android.internal.R.array.config_locationProviderPackageNames,
	mLocationHandler,		mLocationHandler,
	gpsProvider.getGpsGeofenceProxy(),		gpsProvider.getGpsGeofenceProxy(),
	flpHardwareProvider.getGeofenceHardware());		flpHardwareProvider != null ? flpHardwareProvider.getGeofenceHardware() : null);
	if (provider == null) {		if (provider == null) {
	Slog.e(TAG, "Unable to bind FLP Geofence proxy.");		Slog.e(TAG, "Unable to bind FLP Geofence proxy.");
	}		}