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

location: Remove obsolete fake provider support.

Browse Source 
Now that we have GPS support in the emulator and public APIs for mock providers,
the fake provider support is no longer needed.

Signed-off-by: Mike Lockwood <lockwood@android.com>
This commit is contained in:
Mike Lockwood
2009-04-28 13:23:57 -04:00
parent 79762a3ee3
commit b8adcad61d
13 changed files with 0 additions and 1099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
services/java/com/android/server/LocationManagerService.java
View File

@@ -75,7 +75,6 @@ import com.android.internal.location.GpsLocationProvider;
import com.android.internal.location.LocationProviderImpl;
import com.android.internal.location.LocationProviderProxy;
import com.android.internal.location.MockProvider;
import com.android.internal.location.TrackProvider;
import com.android.server.am.BatteryStatsService;
/**
@@ -540,71 +539,6 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
LocationProviderImpl.addProvider(mGpsLocationProvider);
}
// Load fake providers if real providers are not available
File f = new File(LocationManager.PROVIDER_DIR);
if (f.isDirectory()) {
File[] subdirs = f.listFiles();
for (int i = 0; i < subdirs.length; i++) {
if (!subdirs[i].isDirectory()) {
continue;
}
String name = subdirs[i].getName();
if (LOCAL_LOGV) {
Log.v(TAG, "Found dir " + subdirs[i].getAbsolutePath());
Log.v(TAG, "name = " + name);
}
// Don't create a fake provider if a real provider exists
if (LocationProviderImpl.getProvider(name) == null) {
LocationProviderImpl provider = null;
try {
File classFile = new File(subdirs[i], "class");
// Look for a 'class' file
provider = LocationProviderImpl.loadFromClass(classFile);
// Look for an 'kml', 'nmea', or 'track' file
if (provider == null) {
// Load properties from 'properties' file, if present
File propertiesFile = new File(subdirs[i], "properties");
if (propertiesFile.exists()) {
provider = new TrackProvider(name, this);
((TrackProvider)provider).readProperties(propertiesFile);
File kmlFile = new File(subdirs[i], "kml");
if (kmlFile.exists()) {
((TrackProvider) provider).readKml(kmlFile);
} else {
File nmeaFile = new File(subdirs[i], "nmea");
if (nmeaFile.exists()) {
((TrackProvider) provider).readNmea(name, nmeaFile);
} else {
File trackFile = new File(subdirs[i], "track");
if (trackFile.exists()) {
((TrackProvider) provider).readTrack(trackFile);
}
}
}
}
}
if (provider != null) {
LocationProviderImpl.addProvider(provider);
}
// Grab the initial location of a TrackProvider and
// store it as the last known location for that provider
if (provider instanceof TrackProvider) {
TrackProvider tp = (TrackProvider) provider;
mLastKnownLocation.put(tp.getName(), tp.getInitialLocation());
}
} catch (Exception e) {
Log.e(TAG, "Exception loading provder " + name, e);
}
}
}
}
updateProvidersLocked();
}