commit fe2d54533cf3d65b15919df9bba836ff65ba79f5
author Andre Furtado <afurtado@google.com> Mon Aug 22 21:29:59 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 22 21:29:59 2016 +0000
tree 9d6a88977468b9b9a0b343fcc31f58e7e1e457fc
parent 54d1f71323ed65f447930fe8fa485d1615a1aaee
parent 412f2f6089a89196b7a346a342d981d694b50d9c

30481342: Security Vulnerability - TOCTOU in MmsProvider allows access to files as phone (radio) uid - DO NOT MERGE am: 53ff7691e0 am: 20903846d5 am: 37e2a4dca9  -s ours am: 8c659fb296 am: 916c01a5f9 am: d379a7958f am: f393a8dd36  -s ours
am: 412f2f6089

Change-Id: I5eddf8b0e0738436febb5f09cdefea901700e709

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 97e9b69..9c88030 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -261,7 +261,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,"