diff options
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/IccOpenLogicalChannelResponse.java | 21 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/TelephonyIntents.java | 9 |
2 files changed, 16 insertions, 14 deletions
diff --git a/telephony/java/android/telephony/IccOpenLogicalChannelResponse.java b/telephony/java/android/telephony/IccOpenLogicalChannelResponse.java index e9db030..dbe38ea 100644 --- a/telephony/java/android/telephony/IccOpenLogicalChannelResponse.java +++ b/telephony/java/android/telephony/IccOpenLogicalChannelResponse.java @@ -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; diff --git a/telephony/java/com/android/internal/telephony/TelephonyIntents.java b/telephony/java/com/android/internal/telephony/TelephonyIntents.java index 5954947..85ceefd 100644 --- a/telephony/java/com/android/internal/telephony/TelephonyIntents.java +++ b/telephony/java/com/android/internal/telephony/TelephonyIntents.java @@ -266,7 +266,7 @@ public class TelephonyIntents { /** * Activity Action: Start this activity to invoke the carrier setup app. - * To filter the intent, see {@link #CATEGORY_MCCMNC_PREFIX}. + * The carrier app must be signed using a certificate that matches the UICC access rules. * * <p class="note">Callers of this should hold the android.permission.INVOKE_CARRIER_SETUP * permission.</p> @@ -274,13 +274,6 @@ public class TelephonyIntents { public static final String ACTION_CARRIER_SETUP = "android.intent.action.ACTION_CARRIER_SETUP"; /** - * A <em>prefix</em> for the MCC/MNC filtering used with {@link #ACTION_CARRIER_SETUP}. - * The MCC/MNC will be concatenated (zero-padded to 3 digits each) to create a final - * string of the form: {@code android.intent.category.MCCMNC_310260} - */ - public static final String CATEGORY_MCCMNC_PREFIX = "android.intent.category.MCCMNC_"; - - /** * Broadcast Action: A "secret code" has been entered in the dialer. Secret codes are * of the form {@code *#*#<code>#*#*}. The intent will have the data URI: * |