commit 60d936454b038241c3a496fa6a308e09bf3a4239
author Chen Xu <fionaxu@google.com> Mon Jan 07 19:10:48 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 07 19:10:48 2019 +0000
tree f0f7fd3ac85986d2a89202accd911351fc924a34
parent c3b924af478992eb7b3db7c1385095b2f909a69e
parent cf39f060799ebe653c89b9369e10cc9c9640d0da

Merge "Load APN configure file from product image preferentially instead of system image"

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 f4e697e..7244510 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -610,7 +610,9 @@
             File confFile = new File(Environment.getRootDirectory(), PARTNER_APNS_PATH);
             File oemConfFile =  new File(Environment.getOemDirectory(), OEM_APNS_PATH);
             File updatedConfFile = new File(Environment.getDataDirectory(), OTA_UPDATED_APNS_PATH);
+            File productConfFile = new File(Environment.getProductDirectory(), PARTNER_APNS_PATH);
             confFile = pickSecondIfExists(confFile, oemConfFile);
+            confFile = pickSecondIfExists(confFile, productConfFile);
             confFile = pickSecondIfExists(confFile, updatedConfFile);
             return confFile;
         }