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

am 69504b53: Merge "DO NOT MERGE Work around for not getting APN info in NetworkInfo object." into cw-e-dev

Browse Source 
* commit '69504b53553589bf272c2185e709a5cd57cb452c':
  DO NOT MERGE Work around for not getting APN info in NetworkInfo object.
This commit is contained in:
Sharvil Nanavati
2015-08-20 18:45:01 +00:00
committed by Android Git Automerger
parent e30df6fced 69504b5355
commit f8d6f72d5d
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/location/GpsLocationProvider.java
View File

@@ -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*/