commit 032813be862cd8570e96bbca010f3d365e964478
author Andre Furtado <afurtado@google.com> Mon Aug 22 21:30:00 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 22 21:30:00 2016 +0000
tree 9d6a88977468b9b9a0b343fcc31f58e7e1e457fc
parent fe2d54533cf3d65b15919df9bba836ff65ba79f5
parent 1a6f1e60f588bd25825eb90964138025074089e1

30481342: Security Vulnerability - TOCTOU in MmsProvider allows access to files as phone (radio) uid - DO NOT MERGE am: 8ce0cad150  -s ours am: c4cded1767 am: ba689bea2f am: e3615f85c6  -s ours am: e7918d5944 am: 7f07953f8f am: 0b4552fe46 am: 20eea1d7f5  -s ours
am: 1a6f1e60f5

Change-Id: I150d7f2ec8085673fd36d64deae1fa1e2ac18839

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,"