Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure the FlpHardwareProvider is only advertised to GmsCore if the platform supports it.

Browse Source 
b/14117917

Change-Id: Id6c2444893bcf192049e3233d1296eac16fcf826
This commit is contained in:
destradaa
2014-04-30 11:29:11 -07:00
parent 08d4a0ab48
commit cfbdcd2594
2 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
services/core/java/com/android/server/LocationManagerService.java
View File

@@ -426,29 +426,33 @@ public class LocationManagerService extends ILocationManager.Stub {
Slog.e(TAG, "no geocoder provider found");
}
// bind to fused provider
FlpHardwareProvider flpHardwareProvider = FlpHardwareProvider.getInstance(mContext);
FusedProxy fusedProxy = FusedProxy.createAndBind(
mContext,
mLocationHandler,
flpHardwareProvider.getLocationHardware(),
com.android.internal.R.bool.config_enableFusedLocationOverlay,
com.android.internal.R.string.config_fusedLocationProviderPackageName,
com.android.internal.R.array.config_locationProviderPackageNames);
if(fusedProxy == null) {
Slog.e(TAG, "No FusedProvider found.");
}
// bind to fused provider if supported
if (FlpHardwareProvider.isSupported()) {
FlpHardwareProvider flpHardwareProvider = FlpHardwareProvider.getInstance(mContext);
FusedProxy fusedProxy = FusedProxy.createAndBind(
mContext,
mLocationHandler,
flpHardwareProvider.getLocationHardware(),
com.android.internal.R.bool.config_enableFusedLocationOverlay,
com.android.internal.R.string.config_fusedLocationProviderPackageName,
com.android.internal.R.array.config_locationProviderPackageNames);
if(fusedProxy == null) {
Slog.e(TAG, "Unable to bind FusedProxy.");
}
// bind to geofence provider
GeofenceProxy provider = GeofenceProxy.createAndBind(mContext,
com.android.internal.R.bool.config_enableGeofenceOverlay,
com.android.internal.R.string.config_geofenceProviderPackageName,
com.android.internal.R.array.config_locationProviderPackageNames,
mLocationHandler,
gpsProvider.getGpsGeofenceProxy(),
flpHardwareProvider.getGeofenceHardware());
if (provider == null) {
Slog.e(TAG, "no geofence provider found");
// bind to geofence provider
GeofenceProxy provider = GeofenceProxy.createAndBind(mContext,
com.android.internal.R.bool.config_enableGeofenceOverlay,
com.android.internal.R.string.config_geofenceProviderPackageName,
com.android.internal.R.array.config_locationProviderPackageNames,
mLocationHandler,
gpsProvider.getGpsGeofenceProxy(),
flpHardwareProvider.getGeofenceHardware());
if (provider == null) {
Slog.e(TAG, "Unable to bind FLP Geofence proxy.");
}
} else {
Slog.e(TAG, "FLP HAL not supported.");
}
String[] testProviderStrings = resources.getStringArray(

6
services/core/java/com/android/server/location/FlpHardwareProvider.java
View File

@@ -69,6 +69,7 @@ public class FlpHardwareProvider {
sSingletonInstance = new FlpHardwareProvider(context);
}
nativeInit();
return sSingletonInstance;
}
@@ -96,6 +97,7 @@ public class FlpHardwareProvider {
}
public static boolean isSupported() {
nativeInit();
return nativeIsSupported();
}
@@ -216,9 +218,9 @@ public class FlpHardwareProvider {
// Core members
private static native void nativeClassInit();
private static native boolean nativeIsSupported();
private static native void nativeInit();
// FlpLocationInterface members
private native void nativeInit();
private native int nativeGetBatchSize();
private native void nativeStartBatching(int requestId, FusedBatchOptions options);
private native void nativeUpdateBatchingOptions(int requestId, FusedBatchOptions optionsObject);
@@ -258,12 +260,10 @@ public class FlpHardwareProvider {
public static final String GEOFENCING = "Geofencing";
public IFusedLocationHardware getLocationHardware() {
nativeInit();
return mLocationHardware;
}
public IFusedGeofenceHardware getGeofenceHardware() {
nativeInit();
return mGeofenceHardwareService;
}