commit 478c9814c10c6085403f368149b3bf5125f0e67d
author Huang Li <lihuang@codeaurora.org> Mon Dec 12 18:10:08 2016 +0800
committer Huang Li <lihuang@codeaurora.org> Mon Dec 12 18:10:08 2016 +0800
tree c39a7f06fab665ddad1f9d294fd99b1622cce7ea
parent 3886155e5bff107ac20148637d6434f168a81d50
parent ee5bf7a6e7bffa9edb98f85501fd4b324d9c5b4c

Back Merge from rel branch to dev branch  after N-MR1 upgrade

Change-Id: Ibd76aad20fa0c313952f07d20589531b80b6b6c9
CRs-Fixed: 1099303

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 c36bd1b..d2f560f 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -264,7 +264,6 @@
                     + SubscriptionManager.DATA_ROAMING + " INTEGER DEFAULT " + SubscriptionManager.DATA_ROAMING_DEFAULT + ","
                     + SubscriptionManager.MCC + " INTEGER DEFAULT 0,"
                     + SubscriptionManager.MNC + " INTEGER DEFAULT 0,"
-                    + SubscriptionManager.SIM_PROVISIONING_STATUS + " INTEGER DEFAULT " + SubscriptionManager.SIM_PROVISIONED + ","
                     + SubscriptionManager.CB_EXTREME_THREAT_ALERT + " INTEGER DEFAULT 1,"
                     + SubscriptionManager.CB_SEVERE_THREAT_ALERT + " INTEGER DEFAULT 1,"
                     + SubscriptionManager.CB_AMBER_ALERT + " INTEGER DEFAULT 1,"