Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev (12c2136e) · Commits · e / os / android_frameworks_base

Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -373,8 +373,8 @@ LOCAL_SRC_FILES += \
		telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl \
		telephony/java/com/android/internal/telephony/ITelephony.aidl \
		telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \
		telephony/java/com/android/internal/telephony/IOnSubscriptionsChangedListener.aidl \
		telephony/java/com/android/internal/telephony/ISms.aidl \
		telephony/java/com/android/internal/telephony/ISubscriptionListener.aidl \
		telephony/java/com/android/internal/telephony/IWapPushManager.aidl \
		telephony/java/com/android/internal/telephony/ISub.aidl \
		telephony/java/com/android/internal/telephony/IMms.aidl \

api/current.txt

+23 −17

Original line number	Diff line number	Diff line
		@@ -7272,6 +7272,7 @@ package android.content {
		field public static final java.lang.String STORAGE_SERVICE = "storage";
		field public static final java.lang.String TELECOM_SERVICE = "telecom";
		field public static final java.lang.String TELEPHONY_SERVICE = "phone";
		field public static final java.lang.String TELEPHONY_SUBSCRIPTION_SERVICE = "telephony_subscription_service";
		field public static final java.lang.String TEXT_SERVICES_MANAGER_SERVICE = "textservices";
		field public static final java.lang.String TV_INPUT_SERVICE = "tv_input";
		field public static final java.lang.String UI_MODE_SERVICE = "uimode";
		@@ -16934,8 +16935,8 @@ package android.net {
		field public static final deprecated int DEFAULT_NETWORK_PREFERENCE = 1; // 0x1
		field public static final java.lang.String EXTRA_EXTRA_INFO = "extraInfo";
		field public static final java.lang.String EXTRA_IS_FAILOVER = "isFailover";
		field public static final deprecated java.lang.String EXTRA_NETWORK_INFO = "networkInfo";
		field public static final java.lang.String EXTRA_NETWORK = "android.net.extra.NETWORK";
		field public static final deprecated java.lang.String EXTRA_NETWORK_INFO = "networkInfo";
		field public static final java.lang.String EXTRA_NETWORK_REQUEST = "android.net.extra.NETWORK_REQUEST";
		field public static final java.lang.String EXTRA_NETWORK_TYPE = "networkType";
		field public static final java.lang.String EXTRA_NO_CONNECTIVITY = "noConnectivity";
		@@ -25581,7 +25582,7 @@ 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 SUBSCRIPTION_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";
		@@ -25614,7 +25615,7 @@ 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 SUBSCRIPTION_ID = "sub_id";
		field public static final java.lang.String TYPE = "type";
		field public static final java.lang.String USER = "user";
		}
		@@ -25715,7 +25716,7 @@ 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";
		field public static final java.lang.String SUBSCRIPTION_ID = "pending_sub_id";
		}

		public static final class Telephony.Sms implements android.provider.BaseColumns android.provider.Telephony.TextBasedSmsColumns {
		@@ -25801,7 +25802,7 @@ 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 SUBSCRIPTION_ID = "sub_id";
		field public static final java.lang.String THREAD_ID = "thread_id";
		field public static final java.lang.String TYPE = "type";
		}
		@@ -28640,6 +28641,8 @@ package android.telephony {
		public class SubscriptionInfo implements android.os.Parcelable {
		method public android.graphics.Bitmap createIconBitmap(android.content.Context);
		method public int describeContents();
		method public java.lang.CharSequence getCarrierName();
		method public java.lang.String getCountryIso();
		method public int getDataRoaming();
		method public java.lang.CharSequence getDisplayName();
		method public java.lang.String getIccId();
		@@ -28654,20 +28657,22 @@ package android.telephony {
		field public static final android.os.Parcelable.Creator<android.telephony.SubscriptionInfo> CREATOR;
		}

		public class SubscriptionListener {
		ctor public SubscriptionListener();
		ctor public SubscriptionListener(android.os.Looper);
		method public void onSubscriptionInfoChanged();
		field public static final int LISTEN_SUBSCRIPTION_INFO_LIST_CHANGED = 1; // 0x1
		public class SubscriptionManager {
		method public static android.telephony.SubscriptionManager from(android.content.Context);
		method public android.telephony.SubscriptionInfo getActiveSubscriptionInfo(int);
		method public int getActiveSubscriptionInfoCount();
		method public int getActiveSubscriptionInfoCountMax();
		method public android.telephony.SubscriptionInfo getActiveSubscriptionInfoForSimSlotIndex(int);
		method public java.util.List<android.telephony.SubscriptionInfo> getActiveSubscriptionInfoList();
		method public boolean isNetworkRoaming(int);
		method public void registerOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);
		method public void unregisterOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);
		field public static final int INVALID_SUBSCRIPTION_ID = -1; // 0xffffffff
		}

		public class SubscriptionManager implements android.provider.BaseColumns {
		method public static java.util.List<android.telephony.SubscriptionInfo> getActiveSubscriptionInfoList();
		method public static android.telephony.SubscriptionInfo getSubscriptionInfoForSubscriber(int);
		method public static java.util.List<android.telephony.SubscriptionInfo> getSubscriptionInfoUsingSlotId(int);
		method public static void register(android.content.Context, android.telephony.SubscriptionListener, int);
		method public static void unregister(android.content.Context, android.telephony.SubscriptionListener);
		field public static final int INVALID_SUB_ID = -1000; // 0xfffffc18
		public static class SubscriptionManager.OnSubscriptionsChangedListener {
		ctor public SubscriptionManager.OnSubscriptionsChangedListener();
		method public void onSubscriptionsChanged();
		}

		public class TelephonyManager {
		@@ -28705,6 +28710,7 @@ package android.telephony {
		method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String);
		method public boolean isNetworkRoaming();
		method public boolean isSmsCapable();
		method public boolean isVoiceCapable();
		method public void listen(android.telephony.PhoneStateListener, int);
		method public java.lang.String sendEnvelopeWithStatus(java.lang.String);
		method public boolean setGlobalPreferredNetworkType();

core/java/android/app/ContextImpl.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -20,9 +20,9 @@ import android.app.usage.IUsageStatsManager;
		import android.app.usage.UsageStatsManager;
		import android.appwidget.AppWidgetManager;
		import android.os.Build;

		import android.service.persistentdata.IPersistentDataBlockService;
		import android.service.persistentdata.PersistentDataBlockManager;

		import com.android.internal.appwidget.IAppWidgetService;
		import com.android.internal.policy.PolicyManager;
		import com.android.internal.util.Preconditions;
		@@ -125,6 +125,7 @@ import android.print.PrintManager;
		import android.service.fingerprint.IFingerprintService;
		import android.service.fingerprint.FingerprintManager;
		import android.telecom.TelecomManager;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;
		import android.content.ClipboardManager;
		import android.util.AndroidRuntimeException;
		@@ -561,6 +562,11 @@ class ContextImpl extends Context {
		return new TelephonyManager(ctx.getOuterContext());
		}});

		registerService(TELEPHONY_SUBSCRIPTION_SERVICE, new ServiceFetcher() {
		public Object createService(ContextImpl ctx) {
		return new SubscriptionManager(ctx.getOuterContext());
		}});

		registerService(TELECOM_SERVICE, new ServiceFetcher() {
		public Object createService(ContextImpl ctx) {
		return new TelecomManager(ctx.getOuterContext());

core/java/android/content/Context.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -2245,6 +2245,8 @@ public abstract class Context {
		* @see android.media.MediaRouter
		* @see #TELEPHONY_SERVICE
		* @see android.telephony.TelephonyManager
		* @see #TELEPHONY_SUBSCRIPTION_SERVICE
		* @see android.telephony.SubscriptionManager
		* @see #INPUT_METHOD_SERVICE
		* @see android.view.inputmethod.InputMethodManager
		* @see #UI_MODE_SERVICE
		@@ -2587,6 +2589,16 @@ public abstract class Context {
		*/
		public static final String TELEPHONY_SERVICE = "phone";

		/**
		* Use with {@link #getSystemService} to retrieve a
		* {@link android.telephony.SubscriptionManager} for handling management the
		* telephony subscriptions of the device.
		*
		* @see #getSystemService
		* @see android.telephony.SubscriptionManager
		*/
		public static final String TELEPHONY_SUBSCRIPTION_SERVICE = "telephony_subscription_service";

		/**
		* Use with {@link #getSystemService} to retrieve a
		* {@link android.telecom.TelecomManager} to manage telecom-related features

core/java/android/provider/CallLog.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -387,7 +387,6 @@ public class CallLog {
		public static Uri addCall(CallerInfo ci, Context context, String number,
		int presentation, int callType, int features, PhoneAccountHandle accountHandle,
		long start, int duration, Long dataUsage) {
		// FIXME using -1 as subId instead of SubscriptionManager.INVALID_SUB_ID
		return addCall(ci, context, number, presentation, callType, features, accountHandle,
		start, duration, dataUsage, false);
		}