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

Changes to support updating location providers.

Browse Source 
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
This commit is contained in:
Jeff Hamilton
2012-10-03 00:40:50 -05:00
parent 31fed73701
commit c19efc204a
6 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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(

4
services/java/com/android/server/ServiceWatcher.java
View File

@@ -42,7 +42,7 @@ import java.util.List;
*/
public class ServiceWatcher implements ServiceConnection {
private static final boolean D = false;
private static final String EXTRA_VERSION = "version";
private static final String EXTRA_SERVICE_VERSION = "serviceVersion";
private final String mTag;
private final Context mContext;
@@ -127,7 +127,7 @@ public class ServiceWatcher implements ServiceConnection {
// check version
int version = 0;
if (rInfo.serviceInfo.metaData != null) {
version = rInfo.serviceInfo.metaData.getInt(EXTRA_VERSION, 0);
version = rInfo.serviceInfo.metaData.getInt(EXTRA_SERVICE_VERSION, 0);
}
if (version > mVersion) {
bestVersion = version;