5cd731a233
systemReady() was returning before the LocationManagerService was actually ready. Applications making LocationManager transactions during their startup could possibly hit a race condition with the yet-uninitialised LocationManagerService. To guarantee that LocationManagerService is actually ready before returning from systemReady(), we simply do the startup work on the thread that called systemReady(), rather than spin up a secondary thread to do the work asynchronously. LocationWorkerHandler still needs a thread to do its work on, so rather than have it run on the secondary thread that was previously used for systemReady()'s work, we create a HandlerThread for it. Additionally, LocationManagerService.init() really needed to grab lock for some of the things it was doing. I moved all of the code that could benefit from mutex protection to a single section of systemReady() and wrapped it up with a lock while I was at it. Bug: 7723944 Change-Id: I51d480e2781622c3a14769c3a2019a2407dcfd8a
103 lines
3.4 KiB
Java
103 lines
3.4 KiB
Java
/*
|
|
* Copyright (C) 2010 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package com.android.server.location;
|
|
|
|
import android.content.Context;
|
|
import android.location.Address;
|
|
import android.location.GeocoderParams;
|
|
import android.location.IGeocodeProvider;
|
|
import android.os.Handler;
|
|
import android.os.RemoteException;
|
|
import android.os.UserHandle;
|
|
import android.util.Log;
|
|
|
|
import com.android.server.ServiceWatcher;
|
|
import java.util.List;
|
|
|
|
/**
|
|
* Proxy for IGeocodeProvider implementations.
|
|
*/
|
|
public class GeocoderProxy {
|
|
private static final String TAG = "GeocoderProxy";
|
|
|
|
private static final String SERVICE_ACTION = "com.android.location.service.GeocodeProvider";
|
|
|
|
private final Context mContext;
|
|
private final ServiceWatcher mServiceWatcher;
|
|
|
|
public static GeocoderProxy createAndBind(Context context,
|
|
List<String> initialPackageNames, Handler handler, int userId) {
|
|
GeocoderProxy proxy = new GeocoderProxy(context, initialPackageNames, handler, userId);
|
|
if (proxy.bind()) {
|
|
return proxy;
|
|
} else {
|
|
return null;
|
|
}
|
|
}
|
|
|
|
public GeocoderProxy(Context context, List<String> initialPackageNames, Handler handler,
|
|
int userId) {
|
|
mContext = context;
|
|
|
|
mServiceWatcher = new ServiceWatcher(mContext, TAG, SERVICE_ACTION, initialPackageNames,
|
|
null, handler, userId);
|
|
}
|
|
|
|
private boolean bind () {
|
|
return mServiceWatcher.start();
|
|
}
|
|
|
|
private IGeocodeProvider getService() {
|
|
return IGeocodeProvider.Stub.asInterface(mServiceWatcher.getBinder());
|
|
}
|
|
|
|
public String getConnectedPackageName() {
|
|
return mServiceWatcher.getBestPackageName();
|
|
}
|
|
|
|
public String getFromLocation(double latitude, double longitude, int maxResults,
|
|
GeocoderParams params, List<Address> addrs) {
|
|
IGeocodeProvider provider = getService();
|
|
if (provider != null) {
|
|
try {
|
|
return provider.getFromLocation(latitude, longitude, maxResults, params, addrs);
|
|
} catch (RemoteException e) {
|
|
Log.w(TAG, e);
|
|
}
|
|
}
|
|
return "Service not Available";
|
|
}
|
|
|
|
public String getFromLocationName(String locationName,
|
|
double lowerLeftLatitude, double lowerLeftLongitude,
|
|
double upperRightLatitude, double upperRightLongitude, int maxResults,
|
|
GeocoderParams params, List<Address> addrs) {
|
|
IGeocodeProvider provider = getService();
|
|
if (provider != null) {
|
|
try {
|
|
return provider.getFromLocationName(locationName, lowerLeftLatitude,
|
|
lowerLeftLongitude, upperRightLatitude, upperRightLongitude,
|
|
maxResults, params, addrs);
|
|
} catch (RemoteException e) {
|
|
Log.w(TAG, e);
|
|
}
|
|
}
|
|
return "Service not Available";
|
|
}
|
|
|
|
}
|