From ca015d7625ccf7510e81df35c6cf8dc24b032ebd Mon Sep 17 00:00:00 2001
From: Tom Taylor <tomtaylor@google.com>
Date: Wed, 3 Sep 2014 10:04:04 -0700
Subject: [PATCH] Change SmsManager.getSmsManagerForSubId to
 getSmsManagerUsingSubId

Bug 17371475

Change-Id: I2da8e355a3c7b037b55d38484c903f7f387aa97c
---
 api/current.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index fc042d284f373..8432f4ec4bf9b 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -28859,7 +28859,7 @@ package android.telephony {
     method public boolean getAutoPersisting();
     method public android.os.Bundle getCarrierConfigValues();
     method public static android.telephony.SmsManager getDefault();
-    method public static android.telephony.SmsManager getSmsManagerForSubId(long);
+    method public static android.telephony.SmsManager getSmsManagerUsingSubId(long);
     method public long getSubId();
     method public android.net.Uri importMultimediaMessage(byte[], java.lang.String, long, boolean, boolean);
     method public android.net.Uri importTextMessage(java.lang.String, int, java.lang.String, long, boolean, boolean);
@@ -28876,6 +28876,8 @@ package android.telephony {
     method public void updateMmsSendStatus(int, boolean);
     method public void updateSmsSendStatus(int, boolean);
     method public boolean updateStoredMessageStatus(android.net.Uri, android.content.ContentValues);
+    field public static final java.lang.String MESSAGE_STATUS_READ = "read";
+    field public static final java.lang.String MESSAGE_STATUS_SEEN = "seen";
     field public static final java.lang.String MMS_CONFIG_ALIAS_ENABLED = "aliasEnabled";
     field public static final java.lang.String MMS_CONFIG_ALIAS_MAX_CHARS = "aliasMaxChars";
     field public static final java.lang.String MMS_CONFIG_ALIAS_MIN_CHARS = "aliasMinChars";
@@ -28904,8 +28906,6 @@ package android.telephony {
     field public static final java.lang.String MMS_CONFIG_UA_PROF_TAG_NAME = "uaProfTagName";
     field public static final java.lang.String MMS_CONFIG_UA_PROF_URL = "uaProfUrl";
     field public static final java.lang.String MMS_CONFIG_USER_AGENT = "userAgent";
-    field public static final java.lang.String MESSAGE_STATUS_READ = "read";
-    field public static final java.lang.String MESSAGE_STATUS_SEEN = "seen";
     field public static final int MMS_ERROR_HTTP_FAILURE = 4; // 0x4
     field public static final int MMS_ERROR_INVALID_APN = 2; // 0x2
     field public static final int MMS_ERROR_UNABLE_CONNECT_MMS = 3; // 0x3