diff options
| author | Cheuksan Wang <edwang@google.com> | 2014-12-17 20:45:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-17 20:45:03 +0000 |
| commit | f1b64b4bb8300d2079696ff0d70cce16eda2be4e (patch) | |
| tree | 3c143117acd01f1af7629663c1e05ff8243dc7e2 /services | |
| parent | caba360367ea9900a48066f97f4b6e59877a9df6 (diff) | |
| parent | e8ea164596b3ab2309d7b99fa52aecd056e50e24 (diff) | |
| download | frameworks_base-f1b64b4bb8300d2079696ff0d70cce16eda2be4e.zip frameworks_base-f1b64b4bb8300d2079696ff0d70cce16eda2be4e.tar.gz frameworks_base-f1b64b4bb8300d2079696ff0d70cce16eda2be4e.tar.bz2 | |
am e8ea1645: Merge "remove actions and calls for the old sms/mms api BUG: 18005911" into lmp-mr1-dev
* commit 'e8ea164596b3ab2309d7b99fa52aecd056e50e24':
remove actions and calls for the old sms/mms api BUG: 18005911
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/MmsServiceBroker.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/MmsServiceBroker.java b/services/core/java/com/android/server/MmsServiceBroker.java index 83b1919..0de6a03 100644 --- a/services/core/java/com/android/server/MmsServiceBroker.java +++ b/services/core/java/com/android/server/MmsServiceBroker.java @@ -35,7 +35,7 @@ import android.os.Message; import android.os.RemoteException; import android.os.SystemClock; import android.os.UserHandle; -import android.provider.Telephony; +import android.service.carrier.CarrierMessagingService; import android.telephony.TelephonyManager; import android.util.Slog; @@ -230,7 +230,7 @@ public class MmsServiceBroker extends SystemService { return; } contentUri = adjustUriForUserAndGrantPermission(contentUri, - Telephony.Mms.Intents.MMS_SEND_ACTION, + CarrierMessagingService.SERVICE_INTERFACE, Intent.FLAG_GRANT_READ_URI_PERMISSION); getServiceGuarded().sendMessage(subId, callingPkg, contentUri, locationUrl, configOverrides, sentIntent); @@ -248,7 +248,7 @@ public class MmsServiceBroker extends SystemService { return; } contentUri = adjustUriForUserAndGrantPermission(contentUri, - Telephony.Mms.Intents.MMS_DOWNLOAD_ACTION, + CarrierMessagingService.SERVICE_INTERFACE, Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION); getServiceGuarded().downloadMessage(subId, callingPkg, locationUrl, contentUri, |