Merge "Revert "DO NOT MERGE - Hide new SmsManager API's dealing with SubId"" into lmp-sprout-dev

This commit is contained in:
Tom Taylor
2014-09-08 22:30:46 +00:00
committed by Android (Google) Code Review

View File

@@ -28880,6 +28880,8 @@ package android.telephony {
method public void downloadMultimediaMessage(java.lang.String, android.net.Uri, android.os.Bundle, android.app.PendingIntent);
method public android.os.Bundle getCarrierConfigValues();
method public static android.telephony.SmsManager getDefault();
method public static android.telephony.SmsManager getSmsManagerUsingSubId(long);
method public long getSubId();
method public void injectSmsPdu(byte[], java.lang.String, android.app.PendingIntent);
method public void sendDataMessage(java.lang.String, java.lang.String, short, byte[], android.app.PendingIntent, android.app.PendingIntent);
method public void sendMultimediaMessage(android.net.Uri, java.lang.String, android.os.Bundle, android.app.PendingIntent);