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

am 478ac277: am b84138c7: Merge change 23806 into eclair

Browse Source 
Merge commit '478ac27782a4d68f8726a485781bfd18d1f622e1'

* commit '478ac27782a4d68f8726a485781bfd18d1f622e1':
  Handle security exception when Geolocation registers with system location service in DumpRenderTree.
This commit is contained in:
Steve Block
2009-09-03 09:53:19 -07:00
committed by Android Git Automerger
parent 15ab9f5cf7 478ac27782
commit c688891545
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/webkit/GeolocationService.java
View File

@@ -156,11 +156,16 @@ public final class GeolocationService implements LocationListener {
* Registers this object with the location service.
*/
private void registerForLocationUpdates() {
mLocationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 0, 0, this);
mIsNetworkProviderAvailable = true;
if (mIsGpsEnabled) {
mLocationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, this);
mIsGpsProviderAvailable = true;
try {
mLocationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 0, 0, this);
mIsNetworkProviderAvailable = true;
if (mIsGpsEnabled) {
mLocationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, this);
mIsGpsProviderAvailable = true;
}
} catch(SecurityException e) {
Log.e(TAG, "Caught security exception registering for location updates from system. " +
"This should only happen in DumpRenderTree.");
}
}