commit e98a41856032c942b1fd5780c964bca33b96728a
author Tom Cherry <tomcherry@google.com> Wed Jun 01 03:15:49 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 01 03:15:49 2016 +0000
tree b5cc1317899eb69e07e71363f8c28231961155d1
parent 53bf15aab71461f81e27e6f5176afcd1a29af7d4
parent d7b1204cc565f482a6067953cebe25b16cc2a148

Merge "Default apn ip type to ipv4" into nyc-dev

loc_api/libloc_api_50001/loc.cpp

diff --git a/loc_api/libloc_api_50001/loc.cpp b/loc_api/libloc_api_50001/loc.cpp
index e2527b5..1d4e54c 100644
--- a/loc_api/libloc_api_50001/loc.cpp
+++ b/loc_api/libloc_api_50001/loc.cpp
@@ -729,7 +729,7 @@
             bearerType = AGPS_APN_BEARER_IPV4V6;
             break;
         default:
-            bearerType = AGPS_APN_BEARER_INVALID;
+            bearerType = AGPS_APN_BEARER_IPV4;
             break;
     }
 

msm8084/loc_api/libloc_api_50001/loc.cpp

diff --git a/msm8084/loc_api/libloc_api_50001/loc.cpp b/msm8084/loc_api/libloc_api_50001/loc.cpp
index 028b71e..6eaf9f9 100644
--- a/msm8084/loc_api/libloc_api_50001/loc.cpp
+++ b/msm8084/loc_api/libloc_api_50001/loc.cpp
@@ -832,7 +832,7 @@
             bearerType = AGPS_APN_BEARER_IPV4V6;
             break;
         default:
-            bearerType = AGPS_APN_BEARER_INVALID;
+            bearerType = AGPS_APN_BEARER_IPV4;
             break;
     }
 

msm8909/loc_api/libloc_api_50001/loc.cpp

diff --git a/msm8909/loc_api/libloc_api_50001/loc.cpp b/msm8909/loc_api/libloc_api_50001/loc.cpp
index 505fc94..6a97709 100644
--- a/msm8909/loc_api/libloc_api_50001/loc.cpp
+++ b/msm8909/loc_api/libloc_api_50001/loc.cpp
@@ -730,7 +730,7 @@
             bearerType = AGPS_APN_BEARER_IPV4V6;
             break;
         default:
-            bearerType = AGPS_APN_BEARER_INVALID;
+            bearerType = AGPS_APN_BEARER_IPV4;
             break;
     }
 

msm8994/loc_api/libloc_api_50001/loc.cpp

diff --git a/msm8994/loc_api/libloc_api_50001/loc.cpp b/msm8994/loc_api/libloc_api_50001/loc.cpp
index e2527b5..1d4e54c 100644
--- a/msm8994/loc_api/libloc_api_50001/loc.cpp
+++ b/msm8994/loc_api/libloc_api_50001/loc.cpp
@@ -729,7 +729,7 @@
             bearerType = AGPS_APN_BEARER_IPV4V6;
             break;
         default:
-            bearerType = AGPS_APN_BEARER_INVALID;
+            bearerType = AGPS_APN_BEARER_IPV4;
             break;
     }
 

msm8996/loc_api/libloc_api_50001/loc.cpp

diff --git a/msm8996/loc_api/libloc_api_50001/loc.cpp b/msm8996/loc_api/libloc_api_50001/loc.cpp
index 505fc94..6a97709 100644
--- a/msm8996/loc_api/libloc_api_50001/loc.cpp
+++ b/msm8996/loc_api/libloc_api_50001/loc.cpp
@@ -730,7 +730,7 @@
             bearerType = AGPS_APN_BEARER_IPV4V6;
             break;
         default:
-            bearerType = AGPS_APN_BEARER_INVALID;
+            bearerType = AGPS_APN_BEARER_IPV4;
             break;
     }