Revert "Additional changes to SubscriptionManager API as per API council." (2d1ee982) · Commits · e / os / android_frameworks_base

Android.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -372,8 +372,8 @@ LOCAL_SRC_FILES += \
	telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl \		telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl \
	telephony/java/com/android/internal/telephony/ITelephony.aidl \		telephony/java/com/android/internal/telephony/ITelephony.aidl \
	telephony/java/com/android/internal/telephony/ITelephonyRegistry.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/ISms.aidl \
			telephony/java/com/android/internal/telephony/ISubscriptionListener.aidl \
	telephony/java/com/android/internal/telephony/IWapPushManager.aidl \		telephony/java/com/android/internal/telephony/IWapPushManager.aidl \
	telephony/java/com/android/internal/telephony/ISub.aidl \		telephony/java/com/android/internal/telephony/ISub.aidl \
	telephony/java/com/android/internal/telephony/IMms.aidl \		telephony/java/com/android/internal/telephony/IMms.aidl \

api/current.txt

+16 −16

Original line number	Original line	Diff line number	Diff line
	@@ -7268,7 +7268,6 @@ package android.content {
	field public static final java.lang.String STORAGE_SERVICE = "storage";		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 TELECOM_SERVICE = "telecom";
	field public static final java.lang.String TELEPHONY_SERVICE = "phone";		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 TEXT_SERVICES_MANAGER_SERVICE = "textservices";
	field public static final java.lang.String TV_INPUT_SERVICE = "tv_input";		field public static final java.lang.String TV_INPUT_SERVICE = "tv_input";
	field public static final java.lang.String UI_MODE_SERVICE = "uimode";		field public static final java.lang.String UI_MODE_SERVICE = "uimode";
	@@ -25575,7 +25574,7 @@ package android.provider {
	field public static final java.lang.String STATUS = "st";		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 = "sub";
	field public static final java.lang.String SUBJECT_CHARSET = "sub_cs";		field public static final java.lang.String SUBJECT_CHARSET = "sub_cs";
	field public static final java.lang.String SUBSCRIPTION_ID = "sub_id";		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 TEXT_ONLY = "text_only";
	field public static final java.lang.String THREAD_ID = "thread_id";		field public static final java.lang.String THREAD_ID = "thread_id";
	field public static final java.lang.String TRANSACTION_ID = "tr_id";		field public static final java.lang.String TRANSACTION_ID = "tr_id";
	@@ -25608,7 +25607,7 @@ package android.provider {
	field public static final java.lang.String PROXY = "proxy";		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 ROAMING_PROTOCOL = "roaming_protocol";
	field public static final java.lang.String SERVER = "server";		field public static final java.lang.String SERVER = "server";
	field public static final java.lang.String SUBSCRIPTION_ID = "sub_id";		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 TYPE = "type";
	field public static final java.lang.String USER = "user";		field public static final java.lang.String USER = "user";
	}		}
	@@ -25709,7 +25708,7 @@ package android.provider {
	field public static final java.lang.String MSG_TYPE = "msg_type";		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 PROTO_TYPE = "proto_type";
	field public static final java.lang.String RETRY_INDEX = "retry_index";		field public static final java.lang.String RETRY_INDEX = "retry_index";
	field public static final java.lang.String SUBSCRIPTION_ID = "pending_sub_id";		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 {		public static final class Telephony.Sms implements android.provider.BaseColumns android.provider.Telephony.TextBasedSmsColumns {
	@@ -25795,7 +25794,7 @@ package android.provider {
	field public static final int STATUS_NONE = -1; // 0xffffffff		field public static final int STATUS_NONE = -1; // 0xffffffff
	field public static final int STATUS_PENDING = 32; // 0x20		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 SUBJECT = "subject";
	field public static final java.lang.String SUBSCRIPTION_ID = "sub_id";		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 THREAD_ID = "thread_id";
	field public static final java.lang.String TYPE = "type";		field public static final java.lang.String TYPE = "type";
	}		}
	@@ -28648,19 +28647,20 @@ package android.telephony {
	field public static final android.os.Parcelable.Creator<android.telephony.SubscriptionInfo> CREATOR;		field public static final android.os.Parcelable.Creator<android.telephony.SubscriptionInfo> CREATOR;
	}		}

	public class SubscriptionManager {		public class SubscriptionListener {
	method public static android.telephony.SubscriptionManager from(android.content.Context);		ctor public SubscriptionListener();
	method public android.telephony.SubscriptionInfo getActiveSubscriptionInfo(int);		ctor public SubscriptionListener(android.os.Looper);
	method public android.telephony.SubscriptionInfo getActiveSubscriptionInfoForSimSlotIndex(int);		method public void onSubscriptionInfoChanged();
	method public java.util.List<android.telephony.SubscriptionInfo> getActiveSubscriptionInfoList();		field public static final int LISTEN_SUBSCRIPTION_INFO_LIST_CHANGED = 1; // 0x1
	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 static class SubscriptionManager.OnSubscriptionsChangedListener {		public class SubscriptionManager implements android.provider.BaseColumns {
	ctor public SubscriptionManager.OnSubscriptionsChangedListener();		method public static java.util.List<android.telephony.SubscriptionInfo> getActiveSubscriptionInfoList();
	method public void onSubscriptionsChanged();		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 class TelephonyManager {		public class TelephonyManager {

core/java/android/app/ContextImpl.java

+1 −7

core/java/android/content/Context.java

+0 −12

Original line number	Original line	Diff line number	Diff line
	@@ -2244,8 +2244,6 @@ public abstract class Context {
	* @see android.media.MediaRouter		* @see android.media.MediaRouter
	* @see #TELEPHONY_SERVICE		* @see #TELEPHONY_SERVICE
	* @see android.telephony.TelephonyManager		* @see android.telephony.TelephonyManager
	* @see #TELEPHONY_SUBSCRIPTION_SERVICE
	* @see android.telephony.SubscriptionManager
	* @see #INPUT_METHOD_SERVICE		* @see #INPUT_METHOD_SERVICE
	* @see android.view.inputmethod.InputMethodManager		* @see android.view.inputmethod.InputMethodManager
	* @see #UI_MODE_SERVICE		* @see #UI_MODE_SERVICE
	@@ -2588,16 +2586,6 @@ public abstract class Context {
	*/		*/
	public static final String TELEPHONY_SERVICE = "phone";		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		* Use with {@link #getSystemService} to retrieve a
	* {@link android.telecom.TelecomManager} to manage telecom-related features		* {@link android.telecom.TelecomManager} to manage telecom-related features

core/java/android/provider/CallLog.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -387,6 +387,7 @@ public class CallLog {
	public static Uri addCall(CallerInfo ci, Context context, String number,		public static Uri addCall(CallerInfo ci, Context context, String number,
	int presentation, int callType, int features, PhoneAccountHandle accountHandle,		int presentation, int callType, int features, PhoneAccountHandle accountHandle,
	long start, int duration, Long dataUsage) {		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,		return addCall(ci, context, number, presentation, callType, features, accountHandle,
	start, duration, dataUsage, false);		start, duration, dataUsage, false);
	}		}

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

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

	import com.android.internal.appwidget.IAppWidgetService;		import com.android.internal.appwidget.IAppWidgetService;
	import com.android.internal.policy.PolicyManager;		import com.android.internal.policy.PolicyManager;
	import com.android.internal.util.Preconditions;		import com.android.internal.util.Preconditions;
	@@ -125,7 +125,6 @@ import android.print.PrintManager;
	import android.service.fingerprint.IFingerprintService;		import android.service.fingerprint.IFingerprintService;
	import android.service.fingerprint.FingerprintManager;		import android.service.fingerprint.FingerprintManager;
	import android.telecom.TelecomManager;		import android.telecom.TelecomManager;
	import android.telephony.SubscriptionManager;
	import android.telephony.TelephonyManager;		import android.telephony.TelephonyManager;
	import android.content.ClipboardManager;		import android.content.ClipboardManager;
	import android.util.AndroidRuntimeException;		import android.util.AndroidRuntimeException;
	@@ -562,11 +561,6 @@ class ContextImpl extends Context {
	return new TelephonyManager(ctx.getOuterContext());		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() {		registerService(TELECOM_SERVICE, new ServiceFetcher() {
	public Object createService(ContextImpl ctx) {		public Object createService(ContextImpl ctx) {
	return new TelecomManager(ctx.getOuterContext());		return new TelecomManager(ctx.getOuterContext());