Merge "Fixed the incorrect function signature" into qt-dev am: 1fbf66bbf4 (da439379) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/SubscriptionInfo.java

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -87,8 +87,8 @@ public class SubscriptionInfo implements Parcelable {
	private int mCarrierId;		private int mCarrierId;

	/**		/**
	* The source of the name, NAME_SOURCE_UNDEFINED, NAME_SOURCE_DEFAULT_SOURCE,		* The source of the name, NAME_SOURCE_DEFAULT_SOURCE, NAME_SOURCE_SIM_SOURCE or
	* NAME_SOURCE_SIM_SOURCE or NAME_SOURCE_USER_INPUT.		* NAME_SOURCE_USER_INPUT.
	*/		*/
	private int mNameSource;		private int mNameSource;

	@@ -103,7 +103,7 @@ public class SubscriptionInfo implements Parcelable {
	private String mNumber;		private String mNumber;

	/**		/**
	* Data roaming state, DATA_RAOMING_ENABLE, DATA_RAOMING_DISABLE		* Data roaming state, DATA_ROAMING_ENABLE, DATA_ROAMING_DISABLE
	*/		*/
	private int mDataRoaming;		private int mDataRoaming;

	@@ -306,8 +306,8 @@ public class SubscriptionInfo implements Parcelable {
	}		}

	/**		/**
	* @return the source of the name, eg NAME_SOURCE_UNDEFINED, NAME_SOURCE_DEFAULT_SOURCE,		* @return the source of the name, eg NAME_SOURCE_DEFAULT_SOURCE, NAME_SOURCE_SIM_SOURCE or
	* NAME_SOURCE_SIM_SOURCE or NAME_SOURCE_USER_INPUT.		* NAME_SOURCE_USER_INPUT.
	* @hide		* @hide
	*/		*/
	@UnsupportedAppUsage		@UnsupportedAppUsage
	@@ -316,8 +316,8 @@ public class SubscriptionInfo implements Parcelable {
	}		}

	/**		/**
	* Creates and returns an icon {@code Bitmap} to represent this {@code SubscriptionInfo} in a user		* Creates and returns an icon {@code Bitmap} to represent this {@code SubscriptionInfo} in a
	* interface.		* user interface.
	*		*
	* @param context A {@code Context} to get the {@code DisplayMetrics}s from.		* @param context A {@code Context} to get the {@code DisplayMetrics}s from.
	*		*

telephony/java/android/telephony/SubscriptionManager.java

+2 −19

Original line number	Original line	Diff line number	Diff line
	@@ -363,12 +363,6 @@ public class SubscriptionManager {
	*/		*/
	public static final String NAME_SOURCE = "name_source";		public static final String NAME_SOURCE = "name_source";

	/**
	* The name_source is undefined
	* @hide
	*/
	public static final int NAME_SOURCE_UNDEFINDED = -1;

	/**		/**
	* The name_source is the default		* The name_source is the default
	* @hide		* @hide
	@@ -1597,28 +1591,17 @@ public class SubscriptionManager {
	);		);
	}		}

	/**
	* Set display name by simInfo index
	* @param displayName the display name of SIM card
	* @param subId the unique SubscriptionInfo index in database
	* @return the number of records updated
	* @hide
	*/
	public int setDisplayName(String displayName, int subId) {
	return setDisplayName(displayName, subId, NAME_SOURCE_UNDEFINDED);
	}

	/**		/**
	* Set display name by simInfo index with name source		* Set display name by simInfo index with name source
	* @param displayName the display name of SIM card		* @param displayName the display name of SIM card
	* @param subId the unique SubscriptionInfo index in database		* @param subId the unique SubscriptionInfo index in database
	* @param nameSource 0: NAME_SOURCE_DEFAULT_SOURCE, 1: NAME_SOURCE_SIM_SOURCE,		* @param nameSource 0: NAME_SOURCE_DEFAULT_SOURCE, 1: NAME_SOURCE_SIM_SOURCE,
	* 2: NAME_SOURCE_USER_INPUT, -1 NAME_SOURCE_UNDEFINED		* 2: NAME_SOURCE_USER_INPUT
	* @return the number of records updated or < 0 if invalid subId		* @return the number of records updated or < 0 if invalid subId
	* @hide		* @hide
	*/		*/
	@UnsupportedAppUsage		@UnsupportedAppUsage
	public int setDisplayName(String displayName, int subId, long nameSource) {		public int setDisplayName(String displayName, int subId, int nameSource) {
	if (VDBG) {		if (VDBG) {
	logd("[setDisplayName]+ displayName:" + displayName + " subId:" + subId		logd("[setDisplayName]+ displayName:" + displayName + " subId:" + subId
	+ " nameSource:" + nameSource);		+ " nameSource:" + nameSource);

telephony/java/com/android/internal/telephony/ISub.aidl

+1 −9

Original line number	Original line	Diff line number	Diff line
	@@ -144,14 +144,6 @@ interface ISub {
	*/		*/
	int setIconTint(int tint, int subId);		int setIconTint(int tint, int subId);

	/**
	* Set display name by simInfo index
	* @param displayName the display name of SIM card
	* @param subId the unique SubscriptionInfo index in database
	* @return the number of records updated
	*/
	int setDisplayName(String displayName, int subId);

	/**		/**
	* Set display name by simInfo index with name source		* Set display name by simInfo index with name source
	* @param displayName the display name of SIM card		* @param displayName the display name of SIM card
	@@ -159,7 +151,7 @@ interface ISub {
	* @param nameSource, 0: DEFAULT_SOURCE, 1: SIM_SOURCE, 2: USER_INPUT		* @param nameSource, 0: DEFAULT_SOURCE, 1: SIM_SOURCE, 2: USER_INPUT
	* @return the number of records updated		* @return the number of records updated
	*/		*/
	int setDisplayNameUsingSrc(String displayName, int subId, long nameSource);		int setDisplayNameUsingSrc(String displayName, int subId, int nameSource);

	/**		/**
	* Set phone number by subId		* Set phone number by subId