Merge "Modify IccOpenLogicalChannelResponse: Document and rename constants." into lmp-dev (b2d21c21) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -28979,10 +28979,10 @@ package android.telephony {
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		field public static int INVALID_CHANNEL;
		field public static int MISSING_RESOURCE;
		field public static int NO_ERROR;
		field public static int NO_SUCH_ELEMENT;
		field public static int UNKNOWN_ERROR;
		field public static int STATUS_MISSING_RESOURCE;
		field public static int STATUS_NO_ERROR;
		field public static int STATUS_NO_SUCH_ELEMENT;
		field public static int STATUS_UNKNOWN_ERROR;
		}

		public class MessagingConfigurationManager {

+15 −6

Original line number	Diff line number	Diff line
		@@ -24,14 +24,23 @@ import android.os.Parcelable;
		* Response to the {@link TelephonyManager#iccOpenLogicalChannel} command.
		*/
		public class IccOpenLogicalChannelResponse implements Parcelable {
		// Indicates an invalid channel.
		/**
		* Indicates an invalid channel.
		*/
		public static int INVALID_CHANNEL = -1;

		// Possible status values.
		public static int NO_ERROR = 1;
		public static int MISSING_RESOURCE = 2;
		public static int NO_SUCH_ELEMENT = 3;
		public static int UNKNOWN_ERROR = 4;
		/**
		* Possible status values returned by open channel command.
		*
		* STATUS_NO_ERROR: Open channel command returned successfully.
		* STATUS_MISSING_RESOURCE: No logical channels available.
		* STATUS_NO_SUCH_ELEMENT: AID not found on UICC.
		* STATUS_UNKNOWN_ERROR: Unknown error in open channel command.
		*/
		public static int STATUS_NO_ERROR = 1;
		public static int STATUS_MISSING_RESOURCE = 2;
		public static int STATUS_NO_SUCH_ELEMENT = 3;
		public static int STATUS_UNKNOWN_ERROR = 4;

		private final int mChannel;
		private final int mStatus;