Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8ea1645 authored by Cheuksan Wang's avatar Cheuksan Wang Committed by Android (Google) Code Review
Browse files

Merge "remove actions and calls for the old sms/mms api BUG: 18005911" into lmp-mr1-dev

parents e7f301a0 5cec9203

api/current.txt

+0 −9
Original line number Diff line number Diff line
@@ -25657,10 +25657,6 @@ package android.provider { 
  public static final class Telephony.Mms.Intents {

    field public static final java.lang.String CONTENT_CHANGED_ACTION = "android.intent.action.CONTENT_CHANGED";

    field public static final java.lang.String DELETED_CONTENTS = "deleted_contents";

    field public static final java.lang.String EXTRA_MMS_CONTENT_URI = "android.provider.Telephony.extra.MMS_CONTENT_URI";

    field public static final java.lang.String EXTRA_MMS_LOCATION_URL = "android.provider.Telephony.extra.MMS_LOCATION_URL";

    field public static final java.lang.String MMS_DOWNLOAD_ACTION = "android.provider.Telephony.MMS_DOWNLOAD";

    field public static final java.lang.String MMS_SEND_ACTION = "android.provider.Telephony.MMS_SEND";

  }















  public static final class Telephony.Mms.Outbox implements android.provider.Telephony.BaseMmsColumns {










@@ -25765,10 +25761,8 @@ package android.provider {













    field public static final java.lang.String SMS_CB_RECEIVED_ACTION = "android.provider.Telephony.SMS_CB_RECEIVED";















    field public static final java.lang.String SMS_DELIVER_ACTION = "android.provider.Telephony.SMS_DELIVER";















    field public static final java.lang.String SMS_EMERGENCY_CB_RECEIVED_ACTION = "android.provider.Telephony.SMS_EMERGENCY_CB_RECEIVED";













    field public static final java.lang.String SMS_FILTER_ACTION = "android.provider.Telephony.SMS_FILTER";















    field public static final java.lang.String SMS_RECEIVED_ACTION = "android.provider.Telephony.SMS_RECEIVED";















    field public static final java.lang.String SMS_REJECTED_ACTION = "android.provider.Telephony.SMS_REJECTED";













    field public static final java.lang.String SMS_SEND_ACTION = "android.provider.Telephony.SMS_SEND";















    field public static final java.lang.String SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED_ACTION = "android.provider.Telephony.SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED";















    field public static final java.lang.String WAP_PUSH_DELIVER_ACTION = "android.provider.Telephony.WAP_PUSH_DELIVER";















    field public static final java.lang.String WAP_PUSH_RECEIVED_ACTION = "android.provider.Telephony.WAP_PUSH_RECEIVED";










@@ -28511,9 +28505,6 @@ package android.telephony {













    method public void sendMultimediaMessage(android.content.Context, android.net.Uri, java.lang.String, android.os.Bundle, android.app.PendingIntent);















    method public void sendMultipartTextMessage(java.lang.String, java.lang.String, java.util.ArrayList<java.lang.String>, java.util.ArrayList<android.app.PendingIntent>, java.util.ArrayList<android.app.PendingIntent>);















    method public void sendTextMessage(java.lang.String, java.lang.String, java.lang.String, android.app.PendingIntent, android.app.PendingIntent);













    method public void updateMmsDownloadStatus(android.content.Context, int, int, android.net.Uri);













    method public void updateMmsSendStatus(android.content.Context, int, byte[], int, android.net.Uri);













    method public void updateSmsSendStatus(int, boolean);















    field public static final java.lang.String EXTRA_MMS_DATA = "android.telephony.extra.MMS_DATA";















    field public static final java.lang.String EXTRA_MMS_HTTP_STATUS = "android.telephony.extra.MMS_HTTP_STATUS";















    field public static final java.lang.String MMS_CONFIG_ALIAS_ENABLED = "aliasEnabled";

























services/core/java/com/android/server/MmsServiceBroker.java



+3
−3




























Original line number
Diff line number
Diff line








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