commit e17db6943d25522ac409621c611df2f0837db805
author Aaron Knight <starlightknight@slkdev.net> Sun Jul 31 18:35:42 2016 -0400
committer Jackeagle <jackeagle102gmail.com> Mon Nov 14 09:17:27 2016 +0530
tree 679176e12e96e16d558176dc0b93c548b866fa70
parent 2d832e5e80cf474175372a75ae68a64cb44364b6

TelephonyProvider: Fix Default APN Preference Overlay on 1st Boot

In the current code on CM13, the overlay preference can only be
called when Reset APN Settings is called.

Looking at the source history this is a regression. Comparing with
history, I've restored reading the overlay and tested that the
default preference is now marked on the first boot.

Change-Id: I3141d486afd45405c57ed25a89d9fa838fadf794

src/com/android/providers/telephony/TelephonyProvider.java

diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index 7ac05ab..f2d2adb 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -1540,11 +1540,24 @@
         SharedPreferences sp = getContext().getSharedPreferences(PREF_FILE_APN,
                 Context.MODE_PRIVATE);
         long apnId = sp.getLong(COLUMN_APN_ID + subId, INVALID_APN_ID);
-        if (apnId == INVALID_APN_ID && checkApnSp) {
-            apnId = getDefaultPreferredApnId();
-            if (apnId > INVALID_APN_ID) {
-                setPreferredApnId(apnId, subId);
-                deletePreferredApn(subId);
+        if (apnId == INVALID_APN_ID) {
+            if (checkApnSp) {
+                apnId = getPreferredApnIdFromApn(subId);
+                if (apnId == INVALID_APN_ID) {
+                    apnId = getDefaultPreferredApnId();
+
+                    if (apnId != INVALID_APN_ID) {
+                        setPreferredApnId(apnId, subId);
+                    }
+                } else {
+                    setPreferredApnId(apnId, subId);
+                    deletePreferredApn(subId);
+                }
+            } else {
+                apnId = getDefaultPreferredApnId();
+                if (apnId != INVALID_APN_ID) {
+                    setPreferredApnId(apnId, subId);
+                }
             }
         }
         return apnId;