diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-08-04 11:40:25 -0400 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2011-08-04 11:40:25 -0400 |
| commit | 2b15cb21b313f83f7cccdc6f9116ba31ddc190ad (patch) | |
| tree | 68405f8f6a26b7b410e6d491273224953fc64955 /docs/html/sdk/api_diff/4/changes | |
| parent | 7abaecc3dbb610b24e22685e6aa749c7011be1eb (diff) | |
| parent | 75f1fdec3e95e9c8b5add02ba6e9b14913058f22 (diff) | |
Resolve merge conflict for '75f1fdec':
GPS Provider Service changes
GPS engine needs to receive network state changes from Android fw.
Added db query for the current APN, also added a new parameter
between JNI / HAL to the new method in AGpsRilInterface struct
for gps engine to receive APN from GPSLocationService
Conflicts:
services/java/com/android/server/location/GpsLocationProvider.java
Change-Id: I33c45027f1571493d3525324f62d199517c4960c
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'docs/html/sdk/api_diff/4/changes')
0 files changed, 0 insertions, 0 deletions