commit acc453be16667295c18dff9c7caf01ca97839d08
author Ta-wei Yen <twyen@google.com> Tue Oct 11 18:04:44 2016 -0700
committer Ta-wei Yen <twyen@google.com> Tue Oct 11 18:04:44 2016 -0700
tree 18f825df9a92058ad178fc297101536851eedf1e
parent 1a9ef28e6e07348a69f3ca385ca1324f51e84be2
parent b00a3e715ba14870e921750ca4ccf9a09e996077

resolve merge conflicts of b00a3e7 to nyc-dr1-dev

Change-Id: I68b95aeb0debd76e523df12c4b645241be03e311

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 865573e..36a5c07 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -660,7 +660,7 @@
             </intent-filter>
         </provider>
         <receiver android:name="com.android.phone.vvm.omtp.sms.OmtpMessageReceiver"
-            android:exported="true"
+            android:exported="false"
             androidprv:systemUserOnly="true">
             <intent-filter>
                 <action android:name="android.intent.action.VOICEMAIL_SMS_RECEIVED"/>