commit ce2cbcfb524c125883ff1b30fc67010a9ad22343
author Wink Saville <wink@google.com> Mon Jan 28 11:44:06 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 28 11:44:06 2013 -0800
tree 35f7058b0270520ecd155ee49ba32c8068b984ad
parent b0daca77267869d82c921041d3d24be11e32650c
parent e133b2f87214d54f9732e9f90d0388bf3cb0d681

am e133b2f8: am aca9f9cd: Merge "fix typo for comment"

# By Sungmin Choi
# Via Android Git Automerger (1) and others
* commit 'e133b2f87214d54f9732e9f90d0388bf3cb0d681':
  fix typo for comment

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
old mode 100755
new mode 100644
index 040a3d7..3f22e2d
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -168,7 +168,7 @@
                 parser.close();
             }
 
-           // Read external APNS data (partner-provided)
+            // Read external APNS data (partner-provided)
             XmlPullParser confparser = null;
             // Environment.getRootDirectory() is a fancy way of saying ANDROID_ROOT or "/system".
             File confFile = new File(Environment.getRootDirectory(), PARTNER_APNS_PATH);
@@ -226,7 +226,7 @@
                 oldVersion = 6 << 16 | 6;
             }
             if (oldVersion < (7 << 16 | 6)) {
-                // Add protcol fields to the APN. The XML file does not change.
+                // Add carrier_enabled, bearer fields to the APN. The XML file does not change.
                 db.execSQL("ALTER TABLE " + CARRIERS_TABLE +
                         " ADD COLUMN carrier_enabled BOOLEAN DEFAULT 1;");
                 db.execSQL("ALTER TABLE " + CARRIERS_TABLE +