From cfb685d52e820c84766e46882f09bc43cd71e298 Mon Sep 17 00:00:00 2001
From: Cheuksan Wang <edwang@google.com>
Date: Mon, 8 Sep 2014 19:57:31 -0700
Subject: [PATCH] Send and download MMS via content provider instead of PDU
 bytes.

Change-Id: Ib5a93d07799c9e14fea8be820c6bd4bc7ae8be3a
---
 samples/ApiDemos/AndroidManifest.xml                     | 4 ++--
 .../com/example/android/apis/os/MmsMessagingDemo.java    | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/samples/ApiDemos/AndroidManifest.xml b/samples/ApiDemos/AndroidManifest.xml
index 60287d55e..b74e29051 100644
--- a/samples/ApiDemos/AndroidManifest.xml
+++ b/samples/ApiDemos/AndroidManifest.xml
@@ -1369,8 +1369,8 @@
         <provider android:name=".os.MmsFileProvider"
                   android:authorities="com.example.android.apis.os.MmsFileProvider"
                   android:enabled="@bool/atLeastLRelease"
-                  android:permission="android.permission.MODIFY_PHONE_STATE"
-                  android:exported="true"/>
+                  android:grantUriPermissions="true"
+                  android:exported="false" />
 
         <!-- ************************************* -->
         <!--     ANDROID.ANIMATION PACKAGE SAMPLES         -->
diff --git a/samples/ApiDemos/src/com/example/android/apis/os/MmsMessagingDemo.java b/samples/ApiDemos/src/com/example/android/apis/os/MmsMessagingDemo.java
index 40209fcbd..6a5d94c99 100644
--- a/samples/ApiDemos/src/com/example/android/apis/os/MmsMessagingDemo.java
+++ b/samples/ApiDemos/src/com/example/android/apis/os/MmsMessagingDemo.java
@@ -191,8 +191,9 @@ public class MmsMessagingDemo extends Activity {
                 }
 
                 if (contentUri != null) {
-                    SmsManager.getDefault().sendMultimediaMessage(contentUri,
-                            null/*locationUrl*/, null/*configOverrides*/, pendingIntent);
+                    SmsManager.getDefault().sendMultimediaMessage(getApplicationContext(),
+                            contentUri, null/*locationUrl*/, null/*configOverrides*/,
+                            pendingIntent);
                 } else {
                     Log.e(TAG, "Error writing sending Mms");
                     try {
@@ -225,8 +226,8 @@ public class MmsMessagingDemo extends Activity {
                         .build();
                 final PendingIntent pendingIntent = PendingIntent.getBroadcast(
                         MmsMessagingDemo.this, 0, new Intent(ACTION_MMS_RECEIVED), 0);
-                SmsManager.getDefault().downloadMultimediaMessage(locationUrl, contentUri,
-                        null/*configOverrides*/, pendingIntent);
+                SmsManager.getDefault().downloadMultimediaMessage(getApplicationContext(),
+                        locationUrl, contentUri, null/*configOverrides*/, pendingIntent);
             }
         });
     }