diff options
| author | Sharvil Nanavati <sharvil@google.com> | 2015-08-20 16:45:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-20 16:45:52 +0000 |
| commit | 69504b53553589bf272c2185e709a5cd57cb452c (patch) | |
| tree | 88261c2b5f2e0b93bb86ed545adcbf5d0431decf | |
| parent | 7de9fbca0bf968aa4dfa48be042bb45f77fed081 (diff) | |
| parent | 2aa0523f79d1e9de4bc85efb6026a72af5506f0e (diff) | |
| download | frameworks_base-69504b53553589bf272c2185e709a5cd57cb452c.zip frameworks_base-69504b53553589bf272c2185e709a5cd57cb452c.tar.gz frameworks_base-69504b53553589bf272c2185e709a5cd57cb452c.tar.bz2 | |
Merge "DO NOT MERGE Work around for not getting APN info in NetworkInfo object." into cw-e-dev
| -rw-r--r-- | services/core/java/com/android/server/location/GpsLocationProvider.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/location/GpsLocationProvider.java b/services/core/java/com/android/server/location/GpsLocationProvider.java index ba5f516..02f2c73 100644 --- a/services/core/java/com/android/server/location/GpsLocationProvider.java +++ b/services/core/java/com/android/server/location/GpsLocationProvider.java @@ -766,6 +766,10 @@ public class GpsLocationProvider implements LocationProviderInterface { && mAGpsDataConnectionState == AGPS_DATA_CONNECTION_OPENING) { if (mNetworkAvailable) { String apnName = info.getExtraInfo(); + // APN wasn't found in the intent, try to get it from the content provider. + if (apnName == null) { + apnName = getSelectedApn(); + } if (apnName == null) { /* Assign a dummy value in the case of C2K as otherwise we will have a runtime exception in the following call to native_agps_data_conn_open*/ |