commit 2df8a14c753742562962a5edcd5088f28f51615d
author Sungmin Choi <sungmin.choi@lge.com> Wed Nov 04 14:32:52 2015 +0900
committer Vineeta Srivastava <vsrivastava@google.com> Mon Nov 16 22:52:27 2015 +0000
tree cd63875f6f12dd0a5fe6ca1124d11b92df2940fc
parent 10aac5c04c8d08f07e10b83d8e4d14d025c77560

Fix to return mno dun apn when mvno is not matched

If different type with same apn in apns-conf.xml,
apn should merge through createApnList() -> dedupeApnSettings()
but tethering apn will be chosen by fetchDunApn().
So, apn merge does not work in spite of using same apn.

This will cause make a another requestNetwork with same apn.
In this case, Hotspot is not working.

BUG=25331132

Change-Id: I43de74b93c919b0060b3ecc473b048f3c917e729

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
index 4bd71ef..919d3b4 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
@@ -1212,7 +1212,14 @@
             } while (cursor.moveToNext());
         }
 
-        ArrayList<ApnSetting> result = mvnoApns.isEmpty() ? mnoApns : mvnoApns;
+        ArrayList<ApnSetting> result;
+        if (mvnoApns.isEmpty()) {
+            result = mnoApns;
+            // mMvnoMatched = false; - not needed as cleared in createAllApnList
+        } else {
+            result = mvnoApns;
+            mMvnoMatched = true;
+        }
         if (DBG) log("createApnList: X result=" + result);
         return result;
     }
@@ -2257,6 +2264,7 @@
      * Data Connections and setup the preferredApn.
      */
     private void createAllApnList() {
+        mMvnoMatched = false;
         mAllApnSettings = new ArrayList<ApnSetting>();
         IccRecords r = mIccRecords.get();
         String operator = (r != null) ? r.getOperatorNumeric() : "";

src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java

diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java b/src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
index 2f738cc..65b3fa4 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
@@ -240,6 +240,9 @@
     //        really a lower power mode")
     protected boolean mIsScreenOn = true;
 
+    // Indicates if we found mvno-specific APNs in the full APN list.
+    protected boolean mMvnoMatched = false;
+
     /** Allows the generation of unique Id's for DataConnection objects */
     protected AtomicInteger mUniqueIdGenerator = new AtomicInteger(0);
 
@@ -710,7 +713,7 @@
                         }
                         return dunSetting;
                     }
-                } else {
+                } else if (mMvnoMatched == false) {
                     if (VDBG) log("fetchDunApn: global TETHER_DUN_APN dunSetting=" + dunSetting);
                     return dunSetting;
                 }
@@ -731,7 +734,7 @@
                         }
                         return dunSetting;
                     }
-                } else {
+                } else if (mMvnoMatched == false) {
                     retDunSetting = dunSetting;
                 }
             }