83 Commits

Author SHA1 Message Date
Android (Google) Code Review
15d748659d am cde13e6b: Merge change 4954 into donut
Merge commit 'cde13e6bfa6465d5770755892e2ee234a1f85d5c'

* commit 'cde13e6bfa6465d5770755892e2ee234a1f85d5c':
  gps: Check for null APN name to avoid a runtime restart.
2009-06-22 13:24:50 -07:00
Mike Lockwood
b362a9ab91 gps: Check for null APN name to avoid a runtime restart.
We still need to figure out how the APN name is getting set to empty string
by the telephony code.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-06-22 16:20:39 -04:00
Android (Google) Code Review
84c4335f86 am f781b39c: Merge change 4786 into donut
Merge commit 'f781b39cb89dc19e6ad090bd3eb1bedbe7928429'

* commit 'f781b39cb89dc19e6ad090bd3eb1bedbe7928429':
  gps: Set SUPL server via hostname rather than IP address.
2009-06-19 12:12:18 -07:00
Mike Lockwood
a9e546169b gps: Set SUPL server via hostname rather than IP address.
The GPS engine needs the hostname for the secure SUPL case
and deferring the DNS lookup to the HAL might be helpful in the future
if the SUPL server is on a carrier's private network.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-06-19 14:54:42 -04:00
Android (Google) Code Review
989895e43f am fa699ea2: Merge change 3899 into donut
Merge commit 'fa699ea22a13a92694de75ef948a81da23e71642'

* commit 'fa699ea22a13a92694de75ef948a81da23e71642':
  GpsLocationProvider: Add hooks for GPS location injection.
2009-06-11 11:41:38 -07:00
Mike Lockwood
d26ce0d903 GpsLocationProvider: Add hooks for GPS location injection.
This will allow injecting cell ID location to the GPS
(not implemented yet).

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-06-11 12:42:25 -04:00
Android (Google) Code Review
9b1e1400df am 8c690ea9: Merge change 2182 into donut
Merge commit '8c690ea9976d644db3c96eddbbbd2d50eac56913'

* commit '8c690ea9976d644db3c96eddbbbd2d50eac56913':
  location: Replace ILocationCollector interface with new ILocationProvider method
2009-05-21 09:42:38 -07:00
Mike Lockwood
fd6e5f0dda location: Replace ILocationCollector interface with new ILocationProvider method
This change replaces ILocationCollector with a more general mechanism that
passes locations received from a provider to all other providers.
The network location provider now uses this to implement the location collector.
In the future, this could be used to inject network locations to the GPS
as aiding data.

This change also removes the now obsolete permission INSTALL_LOCATION_COLLECTOR.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-21 11:28:20 -04:00
Android (Google) Code Review
0376fe43e6 am 2d10ba33: Merge change 2111 into donut
Merge commit '2d10ba33190c2ff1b24d6c48dd621c55a25bf2cc'

* commit '2d10ba33190c2ff1b24d6c48dd621c55a25bf2cc':
  GPS: Add support for forcing NTP time and XTRA data injection.
2009-05-20 14:11:34 -07:00
Mike Lockwood
93bc44d721 GPS: Add support for forcing NTP time and XTRA data injection.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-20 16:58:22 -04:00
Android (Google) Code Review
2848954530 am 02c1c46f: Merge change 1674 into donut
Merge commit '02c1c46fff22490f884f05520d58eadae1442db8'

* commit '02c1c46fff22490f884f05520d58eadae1442db8':
  gps: Time out after 1 minute if we are unable to get a fix and our fix interval is long.
2009-05-14 14:53:34 -07:00
Mike Lockwood
0632ca7bbe gps: Time out after 1 minute if we are unable to get a fix and our fix interval is long.
This will prevent us from keeping the processor awake indefinitely if a
background service is requesting periodic updates and we are unable to get a fix.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-14 15:51:03 -04:00
Mike Lockwood
9e5d5d6fac am 3681f26: LocationManager: Recover if process containing NetworkLocat
Merge commit '3681f2614fa8c10560c790f6b4287f65d6fd2663'

* commit '3681f2614fa8c10560c790f6b4287f65d6fd2663':
  LocationManager:  Recover if process containing NetworkLocation provider crashes
2009-05-12 07:58:55 -07:00
Mike Lockwood
3681f2614f LocationManager: Recover if process containing NetworkLocation provider crashes
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-12 10:52:03 -04:00
Mike Lockwood
9e35560672 am 2677d0d: LocationManager: Fix a Javadoc comment.
Merge commit '2677d0da34acad93cd7f164d587ccc30c46facc6'

* commit '2677d0da34acad93cd7f164d587ccc30c46facc6':
  LocationManager: Fix a Javadoc comment.
2009-05-12 06:26:37 -07:00
Mike Lockwood
2677d0da34 LocationManager: Fix a Javadoc comment.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-12 09:22:21 -04:00
Android (Google) Code Review
22a262f09d am 5e1d8ae: Merge change 1355 into donut
Merge commit '5e1d8aed4a557a7c055aa4c19875df75d7e41ae6'

* commit '5e1d8aed4a557a7c055aa4c19875df75d7e41ae6':
  GPS: Generalize SUPL support to include AGPS for CDMA
2009-05-11 10:37:20 -07:00
Mike Lockwood
e3635c9693 GPS: Generalize SUPL support to include AGPS for CDMA
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-11 11:02:45 -04:00
Android (Google) Code Review
158b2129cf am f792fc5: Merge change 1150 into donut
Merge commit 'f792fc59c18aa470eb44cc596d5774115e2d9d02'

* commit 'f792fc59c18aa470eb44cc596d5774115e2d9d02':
  location: Location Manager wakelock cleanup
2009-05-07 08:24:05 -07:00
Mike Lockwood
0528b9b26a location: Location Manager wakelock cleanup
Location Providers are now responsible for their own wakelocks and scheduling.

Also fixed a deadlock in LocationManagerService in the code for releasing
wakelocks after client notifications have been received.
The fix is to use the Receiver object and mWakeLock for synchronization
 instead of the global mLock lock.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-07 11:02:22 -04:00
Android (Google) Code Review
54f2422b48 am fd445d3: Merge change 1095 into donut
Merge commit 'fd445d3510cddc7a67cf7720935626684a2f3011'

* commit 'fd445d3510cddc7a67cf7720935626684a2f3011':
  gps: Move GPS scheduling from libgps to GpsLocationProvider.
2009-05-06 15:48:58 -07:00
Mike Lockwood
29c84340a1 gps: Move GPS scheduling from libgps to GpsLocationProvider.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-06 14:52:25 -04:00
Android (Google) Code Review
f431b4b3ee am c770ed8: Merge change 1069 into donut
Merge commit 'c770ed8a6bb7614ed4a85a672e4e6830bed19a95'

* commit 'c770ed8a6bb7614ed4a85a672e4e6830bed19a95':
  GpsStatus: Increase NUM_SATELLITES to 255 for future compatibility.
2009-05-06 08:20:03 -07:00
Mike Lockwood
b7c4ae91d9 GpsStatus: Increase NUM_SATELLITES to 255 for future compatibility.
64 satellties are required for NavStar, WAAS, EGNOS, and GLONASS satellites.
Increasing to 255 allows for future compatibility with Galileo.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-06 10:48:30 -04:00
Mike Lockwood
e90c0da675 am 275555c: location: Add support for location providers outside of the
Merge commit '275555c8eb3fb5df6e7320873b88b77cdde85a9e'

* commit '275555c8eb3fb5df6e7320873b88b77cdde85a9e':
  location: Add support for location providers outside of the system process.
2009-05-01 12:39:03 -07:00
Mike Lockwood
275555c8eb location: Add support for location providers outside of the system process.
Also added new permissions android.permission.INSTALL_LOCATION_PROVIDER
and android.permission.INSTALL_LOCATION_COLLECTOR to the public API.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-01 15:06:31 -04:00
Mike Lockwood
ac7a3de471 am 15e3d0f: location: Use ILocationProvider Binder interface for all loc
Merge commit '15e3d0f082d551f8819fbe4b0d502cc108627876'

* commit '15e3d0f082d551f8819fbe4b0d502cc108627876':
  location: Use ILocationProvider Binder interface for all location providers.
2009-05-01 05:26:44 -07:00
Mike Lockwood
15e3d0f082 location: Use ILocationProvider Binder interface for all location providers.
This change eliminates the LocationProviderImpl class which had been used
for location providers running in the system process.
Now the LocationProvider base class is only used to implement the
LocationManager.createProvider() method for retrieving provider information.
Added a new IGpsStatusProvider interface for providers that serve GPS status.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-01 08:24:47 -04:00
Android (Google) Code Review
212548f634 am 76b25e5: Merge change 692 into donut
Merge commit '76b25e5e78dde3443f9c57c47e5989ad8ff43771'

* commit '76b25e5e78dde3443f9c57c47e5989ad8ff43771':
  location: Optimize use of mProviders ArrayList.
2009-04-29 13:35:38 -07:00
Android (Google) Code Review
77c8adf9ff am 5f2788b: Merge change 686 into donut
Merge commit '5f2788bc9d947f7793aaea06f7e21d6b74c98826'

* commit '5f2788bc9d947f7793aaea06f7e21d6b74c98826':
  gps: Don't crash if no XTRA servers are specified.
2009-04-29 13:35:37 -07:00
Mike Lockwood
73ee32d41b am b8adcad: location: Remove obsolete fake provider support.
Merge commit 'b8adcad61d9225ecdabde1a01b73455f484cbed7'

* commit 'b8adcad61d9225ecdabde1a01b73455f484cbed7':
  location: Remove obsolete fake provider support.
2009-04-29 13:35:34 -07:00
Mike Lockwood
05d0243296 am 79762a3: location: Move DummyLocationProvider.java and LocationProvid
Merge commit '79762a3ee34eb8be5549bcb183af844b6f19c266'

* commit '79762a3ee34eb8be5549bcb183af844b6f19c266':
  location: Move DummyLocationProvider.java and LocationProviderImpl.java to the internal package.
2009-04-29 13:35:34 -07:00
Mike Lockwood
8749fecd99 am eedf815: location: Remove redundant mLocationTracking field from GpsL
Merge commit 'eedf815a2bd44c365a6885553a52cd2fcbfdce8c'

* commit 'eedf815a2bd44c365a6885553a52cd2fcbfdce8c':
  location: Remove redundant mLocationTracking field from GpsLocationProvider
2009-04-29 13:35:34 -07:00
Android (Google) Code Review
093dda9dec am 5fa1533: Merge change 482 into donut
Merge commit '5fa153302c1c7f179bfd6ddd301e7526b8c06de5'

* commit '5fa153302c1c7f179bfd6ddd301e7526b8c06de5':
  location: Location Manager wakelock cleanup, phase 2
2009-04-29 13:35:22 -07:00
Mike Lockwood
662ea09a71 location: Optimize use of mProviders ArrayList.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-04-28 21:38:06 -04:00
Mike Lockwood
b8526bfe09 gps: Don't crash if no XTRA servers are specified.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-04-28 19:04:08 -04:00
Mike Lockwood
b8adcad61d location: Remove obsolete fake provider support.
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>
2009-04-28 13:23:57 -04:00
Mike Lockwood
79762a3ee3 location: Move DummyLocationProvider.java and LocationProviderImpl.java to the internal package.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-04-28 12:42:08 -04:00
Mike Lockwood
eedf815a2b location: Remove redundant mLocationTracking field from GpsLocationProvider
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-04-28 11:17:23 -04:00
Mike Lockwood
48f1751822 location: Location Manager wakelock cleanup, phase 2
Remove two second timeout for wakelock when broadcasting events to
location listeners. Instead, hold wakelock until receipt of the event
is acknowledged, either via a Binder call or the
PendingIntent.OnFinished interface.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-04-23 19:27:41 -07:00
Jean-Baptiste Queru
74008f608a Merge donut into master 2009-04-22 17:12:34 -07:00
Jean-Baptiste Queru
cddff7c3ce Merge commit 'goog/readonly-p4-donut' into HEAD
Conflicts:
	location/java/android/location/Geocoder.java
2009-04-22 12:09:59 -07:00
Xavier Ducrohet
85ae1b1d53 AI 147295: am: CL 147294 am: CL 147290 Update Geocoder javadoc to reflect the need for a backend service.
Original author: xav
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 147295
2009-04-21 18:47:18 -07:00
Xavier Ducrohet
4193558f23 AI 147294: am: CL 147290 Update Geocoder javadoc to reflect the need for a backend service.
Original author: xav
  Merged from: //branches/cupcake/...

Automated import of CL 147294
2009-04-21 18:47:12 -07:00
Android (Google) Code Review
22b8f5e4b7 Merge change 387 into donut
* changes:
  Geocoder: Document behavior when no backend service is available.
2009-04-21 17:31:01 -07:00
Mike Lockwood
71fd04616b Geocoder: Document behavior when no backend service is available.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-04-21 16:45:33 -07:00
Mike Lockwood
375cbb47ff gps: Check for null APN name when receiving telephony notifications.
Fixes bug b/1800584

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-04-21 15:49:38 -07:00
Mike Lockwood
e2b44c5aaf location: Location Manager wakelock cleanup, phase 1
Move cell and wifi lock from LocationManagerService to NetworkLocationProvider

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-04-21 09:38:18 -07:00
Mike Lockwood
98cb667974 More Location Manager cleanup:
Move LocationCollector support out of GpsLocationProvider.
Don't disable GPS when screen is off.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-04-17 18:06:18 -04:00
Mike Lockwood
2f82c4eb0b location: Generalize support for location provider usage tracking.
This replaces two different mechanisms that were used for GPS and Netork
location provider tracking.
Move BatteryStats logging of GPS usage from LocationManagerService to
GpsLocationProvider.
Clean up tracking of location listeners in LocationManagerService and remove
some HashMaps that are no longer needed.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-04-17 17:00:32 -04:00