diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index b1af883..7f10ccc 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -1248,7 +1248,7 @@
                             cv.put(EDITED, new Integer(user_edited));
                         }
                     } else {
-                        cv.put(EDITED, USER_EDITED);
+                        cv.put(EDITED, CARRIER_EDITED);
                     }
 
                     // New EDITED column. Default value (UNEDITED) will
@@ -2352,7 +2352,7 @@
                 values.put(SUBSCRIPTION_ID, subId);
                 values = DatabaseHelper.setDefaultValue(values);
                 if (!values.containsKey(EDITED)) {
-                    values.put(EDITED, USER_EDITED);
+                    values.put(EDITED, CARRIER_EDITED);
                 }
                 // Owned_by should be others if inserted via general uri.
                 values.put(OWNED_BY, OWNED_BY_OTHERS);
@@ -2647,7 +2647,7 @@
             case URL_TELEPHONY:
             {
                 if (!values.containsKey(EDITED)) {
-                    values.put(EDITED, USER_EDITED);
+                    values.put(EDITED, CARRIER_EDITED);
                 }
 
                 // Replace on conflict so that if same APN is present in db with edited
@@ -2676,7 +2676,7 @@
             case URL_CURRENT:
             {
                 if (!values.containsKey(EDITED)) {
-                    values.put(EDITED, USER_EDITED);
+                    values.put(EDITED, CARRIER_EDITED);
                 }
                 // Replace on conflict so that if same APN is present in db with edited
                 // as UNEDITED or USER/CARRIER_DELETED, it is replaced with
@@ -2694,7 +2694,7 @@
                             "Cannot update URL " + url + " with a where clause");
                 }
                 if (!values.containsKey(EDITED)) {
-                    values.put(EDITED, USER_EDITED);
+                    values.put(EDITED, CARRIER_EDITED);
                 }
 
                 try {
