summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNaveen Kumar <kumarn@codeaurora.org>2016-12-07 20:07:30 +0530
committerNaveen Kumar <kumarn@codeaurora.org>2016-12-08 00:21:08 +0530
commitee5bf7a6e7bffa9edb98f85501fd4b324d9c5b4c (patch)
treec39a7f06fab665ddad1f9d294fd99b1622cce7ea
parent19592ca9fd5f5f57d67c62970cdf4d064a80df2d (diff)
parent718606d043e27f9a0246c9180baa78de2c2cfcf1 (diff)
downloadandroid_packages_providers_TelephonyProvider-ee5bf7a6e7bffa9edb98f85501fd4b324d9c5b4c.tar.gz
android_packages_providers_TelephonyProvider-ee5bf7a6e7bffa9edb98f85501fd4b324d9c5b4c.tar.bz2
android_packages_providers_TelephonyProvider-ee5bf7a6e7bffa9edb98f85501fd4b324d9c5b4c.zip
Merge N-MR1 to remote branch.
Change-Id: Id223f8f73908ba347f50cd240422f66c9ccb6135
-rw-r--r--src/com/android/providers/telephony/TelephonyProvider.java1
1 files changed, 0 insertions, 1 deletions
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 @@ public class TelephonyProvider extends ContentProvider
+ 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,"