commit 899c10a5a6dc17e1d57c72656181f1959c9faf3b
author Andre Furtado <afurtado@google.com> Mon Aug 22 22:02:32 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 22 22:02:32 2016 +0000
tree 9d6a88977468b9b9a0b343fcc31f58e7e1e457fc
parent 032813be862cd8570e96bbca010f3d365e964478
parent 6e30cd12b32e4e900f2fb4d4834d39719e6a59e7

30481342: Security Vulnerability - TOCTOU in MmsProvider allows access to files as phone (radio) uid - DO NOT MERGE am: fd9be3377f am: a8ae137579 am: b028c61f44  -s ours am: 7153a8830c  -s ours am: 6af147887d am: 2fe0b17cb1 am: fae6fcbf0f  -s ours am: f0694fe108 am: 02506d63a6 am: 138308b649 am: dd8ccb5662  -s ours
am: 6e30cd12b3

Change-Id: Ibbfdc44fbeb41ee790735bc85c6cfe16ae744a16

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