diff options
| author | Jeff Hamilton <jham@android.com> | 2012-10-03 00:40:50 -0500 |
|---|---|---|
| committer | Jeff Hamilton <jham@android.com> | 2012-10-04 11:00:42 -0500 |
| commit | c19efc204aee1f0f3164dc21bd2ef3fdd4259c71 (patch) | |
| tree | 51d44c5e4dac891b1144f34a351799deb30b2952 /services/java/com/android/server/LocationManagerService.java | |
| parent | 31fed73701041cd5455942abe2dacfc7639c5370 (diff) | |
Changes to support updating location providers.
There is now only a single config value pointing
at a list of packages to get certs from. The old
system was a bit confusing.
The fused location provider also now builds
against SDK 17, and the meta data service version
tag was renamed from the overly generic "version"
to "serviceVersion".
Bug: 7242814
Change-Id: I00d27c9cbd5cc31a37bb4a98160435d15a72e19e
Diffstat (limited to 'services/java/com/android/server/LocationManagerService.java')
| -rw-r--r-- | services/java/com/android/server/LocationManagerService.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java index ae95c4c00882..927bd05ad859 100644 --- a/services/java/com/android/server/LocationManagerService.java +++ b/services/java/com/android/server/LocationManagerService.java @@ -275,14 +275,10 @@ public class LocationManagerService extends ILocationManager.Stub implements Run */ Resources resources = mContext.getResources(); ArrayList<String> providerPackageNames = new ArrayList<String>(); - String[] pkgs1 = resources.getStringArray( + String[] pkgs = resources.getStringArray( com.android.internal.R.array.config_locationProviderPackageNames); - String[] pkgs2 = resources.getStringArray( - com.android.internal.R.array.config_overlay_locationProviderPackageNames); - if (D) Log.d(TAG, "built-in location providers: " + Arrays.toString(pkgs1)); - if (D) Log.d(TAG, "overlay location providers: " + Arrays.toString(pkgs2)); - if (pkgs1 != null) providerPackageNames.addAll(Arrays.asList(pkgs1)); - if (pkgs2 != null) providerPackageNames.addAll(Arrays.asList(pkgs2)); + if (D) Log.d(TAG, "built-in location providers: " + Arrays.toString(pkgs)); + if (pkgs != null) providerPackageNames.addAll(Arrays.asList(pkgs)); // bind to network provider LocationProviderProxy networkProvider = LocationProviderProxy.createAndBind( |