From 78e652a5e4e0281e680f476561a56dee07e66890 Mon Sep 17 00:00:00 2001 From: Wink Saville Date: Tue, 28 Oct 2014 15:32:11 -0700 Subject: [PATCH] Import translations. DO NOT MERGE This is for lmp-sprout-dev only. Hide SubscriptionManager and SubInfoRecord for lmp-sprout-dev branch Change-Id: I5f299a7b200798ada9350bee2c1b26e6f74eaea1 --- api/current.txt | 47 ------------------- .../java/android/telephony/SubInfoRecord.java | 1 + .../telephony/SubscriptionManager.java | 17 ++++++- 3 files changed, 17 insertions(+), 48 deletions(-) diff --git a/api/current.txt b/api/current.txt index 39bd87efdd516..158525c8153b2 100644 --- a/api/current.txt +++ b/api/current.txt @@ -25516,7 +25516,6 @@ package android.provider { field public static final java.lang.String STATUS = "st"; field public static final java.lang.String SUBJECT = "sub"; field public static final java.lang.String SUBJECT_CHARSET = "sub_cs"; - field public static final java.lang.String SUB_ID = "sub_id"; field public static final java.lang.String TEXT_ONLY = "text_only"; field public static final java.lang.String THREAD_ID = "thread_id"; field public static final java.lang.String TRANSACTION_ID = "tr_id"; @@ -25549,7 +25548,6 @@ package android.provider { field public static final java.lang.String PROXY = "proxy"; field public static final java.lang.String ROAMING_PROTOCOL = "roaming_protocol"; field public static final java.lang.String SERVER = "server"; - field public static final java.lang.String SUB_ID = "sub_id"; field public static final java.lang.String TYPE = "type"; field public static final java.lang.String USER = "user"; } @@ -25646,7 +25644,6 @@ package android.provider { field public static final java.lang.String MSG_TYPE = "msg_type"; field public static final java.lang.String PROTO_TYPE = "proto_type"; field public static final java.lang.String RETRY_INDEX = "retry_index"; - field public static final java.lang.String SUB_ID = "pending_sub_id"; } public static final class Telephony.Sms implements android.provider.BaseColumns android.provider.Telephony.TextBasedSmsColumns { @@ -25730,7 +25727,6 @@ package android.provider { field public static final int STATUS_NONE = -1; // 0xffffffff field public static final int STATUS_PENDING = 32; // 0x20 field public static final java.lang.String SUBJECT = "subject"; - field public static final java.lang.String SUB_ID = "sub_id"; field public static final java.lang.String THREAD_ID = "thread_id"; field public static final java.lang.String TYPE = "type"; } @@ -28370,8 +28366,6 @@ package android.telephony { method public void downloadMultimediaMessage(android.content.Context, 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 getSmsManagerForSubscriber(long); - method public long getSubId(); method public void sendDataMessage(java.lang.String, java.lang.String, short, byte[], android.app.PendingIntent, android.app.PendingIntent); 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.util.ArrayList, java.util.ArrayList); @@ -28482,47 +28476,6 @@ package android.telephony { field public byte[] encodedScAddress; } - public class SubInfoRecord implements android.os.Parcelable { - ctor public SubInfoRecord(); - ctor public SubInfoRecord(long, java.lang.String, int, java.lang.String, int, int, java.lang.String, int, int, int[], int, int); - method public int describeContents(); - method public int getColor(); - method public android.graphics.drawable.BitmapDrawable getIconDrawable(); - method public java.lang.String getLabel(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator CREATOR; - field public int color; - field public int dataRoaming; - field public java.lang.String displayName; - field public int displayNumberFormat; - field public java.lang.String iccId; - field public int mcc; - field public int mnc; - field public int nameSource; - field public java.lang.String number; - field public int[] simIconRes; - field public int slotId; - field public long subId; - } - - public class SubscriptionManager implements android.provider.BaseColumns { - method public static java.util.List getActiveSubInfoList(); - method public static long getDefaultSmsSubId(); - method public static int getSlotId(long); - method public static android.telephony.SubInfoRecord getSubInfoForSubscriber(long); - method public static java.util.List getSubInfoUsingSlotId(int); - method public static boolean isValidSubId(long); - field public static final long ASK_USER_SUB_ID = -1001L; // 0xfffffffffffffc17L - field public static final int DEFAULT_PHONE_ID = 2147483647; // 0x7fffffff - field public static final long DEFAULT_SUB_ID = 9223372036854775807L; // 0x7fffffffffffffffL - field public static final int INVALID_PHONE_ID = -1000; // 0xfffffc18 - field public static final int INVALID_SLOT_ID = -1000; // 0xfffffc18 - field public static final long INVALID_SUB_ID = -1000L; // 0xfffffffffffffc18L - field public static final java.lang.String MCC = "mcc"; - field public static final java.lang.String MNC = "mnc"; - field public static final int SIM_NOT_INSERTED = -1; // 0xffffffff - } - public class TelephonyManager { method public java.util.List getAllCellInfo(); method public int getCallState(); diff --git a/telephony/java/android/telephony/SubInfoRecord.java b/telephony/java/android/telephony/SubInfoRecord.java index f2df079da4fa7..10058e285765e 100644 --- a/telephony/java/android/telephony/SubInfoRecord.java +++ b/telephony/java/android/telephony/SubInfoRecord.java @@ -22,6 +22,7 @@ import android.os.Parcelable; /** * A Parcelable class for Subscription Information. + * @hide */ public class SubInfoRecord implements Parcelable { diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index c96c3830b0dc1..b37a75206908b 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -18,6 +18,7 @@ package android.telephony; import android.annotation.SdkConstant; import android.annotation.SdkConstant.SdkConstantType; +import android.annotation.SystemApi; import android.content.Intent; import android.net.Uri; import android.provider.BaseColumns; @@ -37,6 +38,8 @@ import java.util.List; * * The android.Manifest.permission.READ_PHONE_STATE to retrieve the information, except * getActiveSubIdList and getActiveSubIdCount for which no permission is needed. + * + * @hide */ public class SubscriptionManager implements BaseColumns { private static final String LOG_TAG = "SUB"; @@ -44,25 +47,31 @@ public class SubscriptionManager implements BaseColumns { private static final boolean VDBG = false; /** An invalid phone identifier */ + @SystemApi public static final int INVALID_PHONE_ID = -1000; /** Indicates the caller wants the default phone id. */ + @SystemApi public static final int DEFAULT_PHONE_ID = Integer.MAX_VALUE; /** An invalid slot identifier */ + @SystemApi public static final int INVALID_SLOT_ID = -1000; /** Indicates the caller wants the default slot id. */ - /** @hide */ + @SystemApi public static final int DEFAULT_SLOT_ID = Integer.MAX_VALUE; /** Indicates the user should be asked which subscription to use. */ + @SystemApi public static final long ASK_USER_SUB_ID = -1001; /** An invalid subscription identifier */ + @SystemApi public static final long INVALID_SUB_ID = -1000; /** Indicates the caller wants the default sub id. */ + @SystemApi public static final long DEFAULT_SUB_ID = Long.MAX_VALUE; /** Minimum possible subid that represents a subscription */ @@ -116,6 +125,7 @@ public class SubscriptionManager implements BaseColumns { public static final String SIM_ID = "sim_id"; /** SIM is not inserted */ + @SystemApi public static final int SIM_NOT_INSERTED = -1; /** @@ -322,6 +332,7 @@ public class SubscriptionManager implements BaseColumns { * @param slotId the slot which the SIM is inserted * @return SubInfoRecord list, maybe empty but not null */ + @SystemApi public static List getSubInfoUsingSlotId(int slotId) { // FIXME: Consider never returning null if (!isValidSlotId(slotId)) { @@ -377,6 +388,7 @@ public class SubscriptionManager implements BaseColumns { * Get the SubInfoRecord(s) of the currently inserted SIM(s) * @return Array list of currently inserted SubInfoRecord(s) maybe empty but not null */ + @SystemApi public static List getActiveSubInfoList() { List result = null; @@ -633,6 +645,7 @@ public class SubscriptionManager implements BaseColumns { * @return slotId as a positive integer or a negative value if an error either * SIM_NOT_INSERTED or INVALID_SLOT_ID. */ + @SystemApi public static int getSlotId(long subId) { if (!isValidSubId(subId)) { logd("[getSlotId]- fail"); @@ -791,6 +804,7 @@ public class SubscriptionManager implements BaseColumns { /** * @return subId of the DefaultSms subscription or the value INVALID_SUB_ID if an error. */ + @SystemApi public static long getDefaultSmsSubId() { long subId = INVALID_SUB_ID; @@ -919,6 +933,7 @@ public class SubscriptionManager implements BaseColumns { /** * @return true if a valid subId else false */ + @SystemApi public static boolean isValidSubId(long subId) { return subId > INVALID_SUB_ID ; }