commit 3a9452fbc785abe6538c7628ce0ac96a472cd4b0
author The Android Automerger <android-build@google.com> Thu Jan 15 06:10:37 2015 -0800
committer The Android Automerger <android-build@google.com> Thu Jan 15 06:10:37 2015 -0800
tree 8feb1f9a6c312d4e659e6ad1c6f252e05afa4320
parent b16a120d3442e88e463d6140ecba1af75a992116
parent b67de6ce08d97d02baeb1433e98547992d5592d1

merge in lmp-mr1-release history after reset to lmp-mr1-dev

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 35e070e..64ab430 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -86,6 +86,7 @@
     private static final String COLUMN_APN_ID = "apn_id";
 
     private static final String PARTNER_APNS_PATH = "etc/apns-conf.xml";
+    private static final String OEM_APNS_PATH = "telephony/apns-conf.xml";
 
     private static final UriMatcher s_urlMatcher = new UriMatcher(UriMatcher.NO_MATCH);
 
@@ -261,7 +262,27 @@
             XmlPullParser confparser = null;
             // Environment.getRootDirectory() is a fancy way of saying ANDROID_ROOT or "/system".
             File confFile = new File(Environment.getRootDirectory(), PARTNER_APNS_PATH);
+            File oemConfFile =  new File(Environment.getOemDirectory(), OEM_APNS_PATH);
+            if (oemConfFile.exists()) {
+                // OEM image exist APN xml, get the timestamp from OEM & System image for comparison
+                long oemApnTime = oemConfFile.lastModified();
+                long sysApnTime = confFile.lastModified();
+                if (DBG) log("APNs Timestamp: oemTime = " + oemApnTime + " sysTime = "
+                        + sysApnTime);
+
+                // To get the latest version from OEM or System image
+                if (oemApnTime > sysApnTime) {
+                    if (DBG) log("APNs Timestamp: OEM image is greater than System image");
+                    confFile = oemConfFile;
+                }
+            } else {
+                // No Apn in OEM image, so load it from system image.
+                if (DBG) log("No APNs in OEM image = " + oemConfFile.getPath() +
+                        " Load APNs from system image");
+            }
+
             FileReader confreader = null;
+            if (DBG) log("confFile = " + confFile);
             try {
                 confreader = new FileReader(confFile);
                 confparser = Xml.newPullParser();