diff options
10 files changed, 377 insertions, 233 deletions
diff --git a/lowpan/java/android/net/lowpan/ILowpanInterface.aidl b/lowpan/java/android/net/lowpan/ILowpanInterface.aidl index 329e9fa1d743..e49e72574a31 100644 --- a/lowpan/java/android/net/lowpan/ILowpanInterface.aidl +++ b/lowpan/java/android/net/lowpan/ILowpanInterface.aidl @@ -137,22 +137,17 @@ interface ILowpanInterface { const int ERROR_INVALID_ARGUMENT = 2; const int ERROR_DISABLED = 3; const int ERROR_WRONG_STATE = 4; - const int ERROR_INVALID_TYPE = 5; - const int ERROR_INVALID_VALUE = 6; - const int ERROR_TIMEOUT = 7; - const int ERROR_IO_FAILURE = 8; - const int ERROR_BUSY = 9; - const int ERROR_ALREADY = 10; - const int ERROR_CANCELED = 11; - const int ERROR_CREDENTIAL_NEEDED = 12; - const int ERROR_FEATURE_NOT_SUPPORTED = 14; - const int ERROR_PROPERTY_NOT_FOUND = 16; - const int ERROR_JOIN_FAILED_UNKNOWN = 18; - const int ERROR_JOIN_FAILED_AT_SCAN = 19; - const int ERROR_JOIN_FAILED_AT_AUTH = 20; - const int ERROR_FORM_FAILED_AT_SCAN = 21; - const int ERROR_NCP_PROBLEM = 27; - const int ERROR_PERMISSION_DENIED = 28; + const int ERROR_TIMEOUT = 5; + const int ERROR_IO_FAILURE = 6; + const int ERROR_NCP_PROBLEM = 7; + const int ERROR_BUSY = 8; + const int ERROR_ALREADY = 9; + const int ERROR_CANCELED = 10; + const int ERROR_FEATURE_NOT_SUPPORTED = 11; + const int ERROR_JOIN_FAILED_UNKNOWN = 12; + const int ERROR_JOIN_FAILED_AT_SCAN = 13; + const int ERROR_JOIN_FAILED_AT_AUTH = 14; + const int ERROR_FORM_FAILED_AT_SCAN = 15; ////////////////////////////////////////////////////////////////////////// // Methods diff --git a/lowpan/java/android/net/lowpan/InterfaceDisabledException.java b/lowpan/java/android/net/lowpan/InterfaceDisabledException.java new file mode 100644 index 000000000000..e917d4521bae --- /dev/null +++ b/lowpan/java/android/net/lowpan/InterfaceDisabledException.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.net.lowpan; + +/** + * Exception indicating this operation requires the interface to be enabled. + * + * @see LowpanInterface + * @hide + */ +// @SystemApi +public class InterfaceDisabledException extends LowpanException { + + public InterfaceDisabledException() {} + + public InterfaceDisabledException(String message) { + super(message); + } + + public InterfaceDisabledException(String message, Throwable cause) { + super(message, cause); + } + + protected InterfaceDisabledException(Exception cause) { + super(cause); + } +} diff --git a/lowpan/java/android/net/lowpan/JoinFailedAtAuthException.java b/lowpan/java/android/net/lowpan/JoinFailedAtAuthException.java new file mode 100644 index 000000000000..7aceb71e2a85 --- /dev/null +++ b/lowpan/java/android/net/lowpan/JoinFailedAtAuthException.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.net.lowpan; + +/** + * Exception indicating the join operation was unable to find the given network. + * + * @see LowpanInterface + * @hide + */ +// @SystemApi +public class JoinFailedAtAuthException extends JoinFailedException { + + public JoinFailedAtAuthException() {} + + public JoinFailedAtAuthException(String message) { + super(message); + } + + public JoinFailedAtAuthException(String message, Throwable cause) { + super(message, cause); + } + + public JoinFailedAtAuthException(Exception cause) { + super(cause); + } +} diff --git a/lowpan/java/android/net/lowpan/JoinFailedAtScanException.java b/lowpan/java/android/net/lowpan/JoinFailedAtScanException.java new file mode 100644 index 000000000000..a4346f98d719 --- /dev/null +++ b/lowpan/java/android/net/lowpan/JoinFailedAtScanException.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.net.lowpan; + +/** + * Exception indicating the join operation was unable to find the given network. + * + * @see LowpanInterface + * @hide + */ +// @SystemApi +public class JoinFailedAtScanException extends JoinFailedException { + + public JoinFailedAtScanException() {} + + public JoinFailedAtScanException(String message) { + super(message); + } + + public JoinFailedAtScanException(String message, Throwable cause) { + super(message, cause); + } + + public JoinFailedAtScanException(Exception cause) { + super(cause); + } +} diff --git a/lowpan/java/android/net/lowpan/JoinFailedException.java b/lowpan/java/android/net/lowpan/JoinFailedException.java new file mode 100644 index 000000000000..e51d3829f9f1 --- /dev/null +++ b/lowpan/java/android/net/lowpan/JoinFailedException.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.net.lowpan; + +/** + * Exception indicating the join operation has failed. + * + * @see LowpanInterface + * @hide + */ +// @SystemApi +public class JoinFailedException extends LowpanException { + + public JoinFailedException() {} + + public JoinFailedException(String message) { + super(message); + } + + public JoinFailedException(String message, Throwable cause) { + super(message, cause); + } + + protected JoinFailedException(Exception cause) { + super(cause); + } +} diff --git a/lowpan/java/android/net/lowpan/LowpanException.java b/lowpan/java/android/net/lowpan/LowpanException.java index 5a1f72993fb5..5dfce48d3f17 100644 --- a/lowpan/java/android/net/lowpan/LowpanException.java +++ b/lowpan/java/android/net/lowpan/LowpanException.java @@ -28,245 +28,65 @@ import android.util.AndroidException; */ // @SystemApi public class LowpanException extends AndroidException { - // Make the eclipse warning about serializable exceptions go away - private static final long serialVersionUID = 0x31863cbe562b0e11l; // randomly generated + public LowpanException() {} - public static final int LOWPAN_ERROR = 1; - public static final int LOWPAN_CREDENTIAL_NEEDED = 2; - public static final int LOWPAN_DEAD = 3; - public static final int LOWPAN_DISABLED = 4; - public static final int LOWPAN_WRONG_STATE = 5; - public static final int LOWPAN_BUSY = 7; - public static final int LOWPAN_NCP_PROBLEM = 8; - public static final int LOWPAN_ALREADY = 9; - public static final int LOWPAN_CANCELED = 10; - public static final int LOWPAN_FEATURE_NOT_SUPPORTED = 12; - public static final int LOWPAN_PROPERTY_NOT_FOUND = 13; - public static final int LOWPAN_JOIN_FAILED_UNKNOWN = 14; - public static final int LOWPAN_JOIN_FAILED_AT_SCAN = 15; - public static final int LOWPAN_JOIN_FAILED_AT_AUTH = 16; - public static final int LOWPAN_FORM_FAILED_AT_SCAN = 17; + public LowpanException(String message) { + super(message); + } - public static LowpanException rethrowAsLowpanException(ServiceSpecificException e) - throws LowpanException { - int reason; - switch (e.errorCode) { - case ILowpanInterface.ERROR_INVALID_ARGUMENT: - case ILowpanInterface.ERROR_INVALID_TYPE: - case ILowpanInterface.ERROR_INVALID_VALUE: - throw new IllegalArgumentException(e.getMessage(), e); + public LowpanException(String message, Throwable cause) { + super(message, cause); + } - case ILowpanInterface.ERROR_PERMISSION_DENIED: - throw new SecurityException(e.getMessage(), e); + public LowpanException(Exception cause) { + super(cause); + } + /* This method returns LowpanException so that the caller + * can add "throw" before the invocation of this method. + * This might seem superfluous, but it is actually to + * help provide a hint to the java compiler that this + * function will not return. + */ + static LowpanException rethrowFromServiceSpecificException(ServiceSpecificException e) + throws LowpanException { + switch (e.errorCode) { case ILowpanInterface.ERROR_DISABLED: - reason = LowpanException.LOWPAN_DISABLED; - break; + throw new InterfaceDisabledException(e); case ILowpanInterface.ERROR_WRONG_STATE: - reason = LowpanException.LOWPAN_WRONG_STATE; - break; - - case ILowpanInterface.ERROR_BUSY: - reason = LowpanException.LOWPAN_BUSY; - break; - - case ILowpanInterface.ERROR_ALREADY: - reason = LowpanException.LOWPAN_ALREADY; - break; + throw new WrongStateException(e); case ILowpanInterface.ERROR_CANCELED: - reason = LowpanException.LOWPAN_CANCELED; - break; - - case ILowpanInterface.ERROR_CREDENTIAL_NEEDED: - reason = LowpanException.LOWPAN_CREDENTIAL_NEEDED; - break; - - case ILowpanInterface.ERROR_FEATURE_NOT_SUPPORTED: - reason = LowpanException.LOWPAN_FEATURE_NOT_SUPPORTED; - break; - - case ILowpanInterface.ERROR_PROPERTY_NOT_FOUND: - reason = LowpanException.LOWPAN_PROPERTY_NOT_FOUND; - break; + throw new OperationCanceledException(e); case ILowpanInterface.ERROR_JOIN_FAILED_UNKNOWN: - reason = LowpanException.LOWPAN_JOIN_FAILED_UNKNOWN; - break; + throw new JoinFailedException(e); case ILowpanInterface.ERROR_JOIN_FAILED_AT_SCAN: - reason = LowpanException.LOWPAN_JOIN_FAILED_AT_SCAN; - break; + throw new JoinFailedAtScanException(e); case ILowpanInterface.ERROR_JOIN_FAILED_AT_AUTH: - reason = LowpanException.LOWPAN_JOIN_FAILED_AT_AUTH; - break; + throw new JoinFailedAtAuthException(e); case ILowpanInterface.ERROR_FORM_FAILED_AT_SCAN: - reason = LowpanException.LOWPAN_FORM_FAILED_AT_SCAN; - break; + throw new NetworkAlreadyExistsException(e); - case ILowpanInterface.ERROR_TIMEOUT: - case ILowpanInterface.ERROR_NCP_PROBLEM: - reason = LowpanException.LOWPAN_NCP_PROBLEM; - break; - case ILowpanInterface.ERROR_UNSPECIFIED: - default: - reason = LOWPAN_ERROR; - break; - } - throw new LowpanException(reason, e.getMessage(), e); - } - - private final int mReason; - - public final int getReason() { - return mReason; - } - - public LowpanException(int problem) { - super(getDefaultMessage(problem)); - mReason = problem; - } - - public LowpanException(String message) { - super(getCombinedMessage(LOWPAN_ERROR, message)); - mReason = LOWPAN_ERROR; - } - - public LowpanException(int problem, String message, Throwable cause) { - super(getCombinedMessage(problem, message), cause); - mReason = problem; - } - - public LowpanException(int problem, Throwable cause) { - super(getDefaultMessage(problem), cause); - mReason = problem; - } - - /** @hide */ - public static String getDefaultMessage(int problem) { - String problemString; - - // TODO: Does this need localization? - - switch (problem) { - case LOWPAN_DEAD: - problemString = "LoWPAN interface is no longer alive"; - break; - case LOWPAN_DISABLED: - problemString = "LoWPAN interface is disabled"; - break; - case LOWPAN_WRONG_STATE: - problemString = "LoWPAN interface in wrong state to perfom requested action"; - break; - case LOWPAN_BUSY: - problemString = - "LoWPAN interface was unable to perform the requestion action because it was busy"; - break; - case LOWPAN_NCP_PROBLEM: - problemString = - "The Network Co-Processor associated with this interface has experienced a problem"; - break; - case LOWPAN_ALREADY: - problemString = "The LoWPAN interface is already in the given state"; - break; - case LOWPAN_CANCELED: - problemString = "This operation was canceled"; - break; - case LOWPAN_CREDENTIAL_NEEDED: - problemString = "Additional credentials are required to complete this operation"; - break; - case LOWPAN_FEATURE_NOT_SUPPORTED: - problemString = - "A dependent feature required to perform the given action is not currently supported"; - break; - case LOWPAN_PROPERTY_NOT_FOUND: - problemString = "The given property was not found"; - break; - case LOWPAN_JOIN_FAILED_UNKNOWN: - problemString = "The join operation failed for an unspecified reason"; - break; - case LOWPAN_JOIN_FAILED_AT_SCAN: - problemString = - "The join operation failed because it could not communicate with any peers"; - break; - case LOWPAN_JOIN_FAILED_AT_AUTH: - problemString = - "The join operation failed because the credentials were not accepted by any peers"; - break; - case LOWPAN_FORM_FAILED_AT_SCAN: - problemString = "Network form failed"; - break; - case LOWPAN_ERROR: - default: - problemString = "The requested LoWPAN operation failed"; - break; - } - - return problemString; - } + case ILowpanInterface.ERROR_FEATURE_NOT_SUPPORTED: + throw new LowpanException( + e.getMessage() != null ? e.getMessage() : "Feature not supported", e); - private static String getCombinedMessage(int problem, String message) { - String problemString = getProblemString(problem); - return String.format("%s (%d): %s", problemString, problem, message); - } + case ILowpanInterface.ERROR_NCP_PROBLEM: + throw new LowpanRuntimeException( + e.getMessage() != null ? e.getMessage() : "NCP problem", e); - private static String getProblemString(int problem) { - String problemString; + case ILowpanInterface.ERROR_INVALID_ARGUMENT: + throw new LowpanRuntimeException( + e.getMessage() != null ? e.getMessage() : "Invalid argument", e); - switch (problem) { - case LOWPAN_ERROR: - problemString = "LOWPAN_ERROR"; - break; - case LOWPAN_DEAD: - problemString = "LOWPAN_DEAD"; - break; - case LOWPAN_DISABLED: - problemString = "LOWPAN_DISABLED"; - break; - case LOWPAN_WRONG_STATE: - problemString = "LOWPAN_WRONG_STATE"; - break; - case LOWPAN_BUSY: - problemString = "LOWPAN_BUSY"; - break; - case LOWPAN_NCP_PROBLEM: - problemString = "LOWPAN_NCP_PROBLEM"; - break; - case LOWPAN_ALREADY: - problemString = "LOWPAN_ALREADY"; - break; - case LOWPAN_CANCELED: - problemString = "LOWPAN_CANCELED"; - break; - case LOWPAN_CREDENTIAL_NEEDED: - problemString = "LOWPAN_CREDENTIAL_NEEDED"; - break; - case LOWPAN_FEATURE_NOT_SUPPORTED: - problemString = "LOWPAN_FEATURE_NOT_SUPPORTED"; - break; - case LOWPAN_PROPERTY_NOT_FOUND: - problemString = "LOWPAN_PROPERTY_NOT_FOUND"; - break; - case LOWPAN_JOIN_FAILED_UNKNOWN: - problemString = "LOWPAN_JOIN_FAILED_UNKNOWN"; - break; - case LOWPAN_JOIN_FAILED_AT_SCAN: - problemString = "LOWPAN_JOIN_FAILED_AT_SCAN"; - break; - case LOWPAN_JOIN_FAILED_AT_AUTH: - problemString = "LOWPAN_JOIN_FAILED_AT_AUTH"; - break; - case LOWPAN_FORM_FAILED_AT_SCAN: - problemString = "LOWPAN_FORM_FAILED_AT_SCAN"; - break; + case ILowpanInterface.ERROR_UNSPECIFIED: default: - problemString = "LOWPAN_ERROR_CODE_" + problem; - break; + throw new LowpanRuntimeException(e); } - - return problemString; } } diff --git a/lowpan/java/android/net/lowpan/LowpanRuntimeException.java b/lowpan/java/android/net/lowpan/LowpanRuntimeException.java new file mode 100644 index 000000000000..71a5a1397a4e --- /dev/null +++ b/lowpan/java/android/net/lowpan/LowpanRuntimeException.java @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.net.lowpan; + +import android.util.AndroidRuntimeException; + +/** + * Generic runtime exception for LoWPAN operations. + * + * @hide + */ +// @SystemApi +public class LowpanRuntimeException extends AndroidRuntimeException { + + public LowpanRuntimeException() {} + + public LowpanRuntimeException(String message) { + super(message); + } + + public LowpanRuntimeException(String message, Throwable cause) { + super(message, cause); + } + + public LowpanRuntimeException(Exception cause) { + super(cause); + } +} diff --git a/lowpan/java/android/net/lowpan/NetworkAlreadyExistsException.java b/lowpan/java/android/net/lowpan/NetworkAlreadyExistsException.java new file mode 100644 index 000000000000..90ef498baaba --- /dev/null +++ b/lowpan/java/android/net/lowpan/NetworkAlreadyExistsException.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.net.lowpan; + +/** + * Exception indicating the form operation found a network nearby with the same identity. + * + * @see LowpanInterface + * @hide + */ +// @SystemApi +public class NetworkAlreadyExistsException extends LowpanException { + + public NetworkAlreadyExistsException() {} + + public NetworkAlreadyExistsException(String message) { + super(message, null); + } + + public NetworkAlreadyExistsException(String message, Throwable cause) { + super(message, cause); + } + + public NetworkAlreadyExistsException(Exception cause) { + super(cause); + } +} diff --git a/lowpan/java/android/net/lowpan/OperationCanceledException.java b/lowpan/java/android/net/lowpan/OperationCanceledException.java new file mode 100644 index 000000000000..fcafe3ae9b8f --- /dev/null +++ b/lowpan/java/android/net/lowpan/OperationCanceledException.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.net.lowpan; + +/** + * Exception indicating this operation was canceled by the driver before it could finish. + * + * @see LowpanInterface + * @hide + */ +// @SystemApi +public class OperationCanceledException extends LowpanException { + + public OperationCanceledException() {} + + public OperationCanceledException(String message) { + super(message); + } + + public OperationCanceledException(String message, Throwable cause) { + super(message, cause); + } + + protected OperationCanceledException(Exception cause) { + super(cause); + } +} diff --git a/lowpan/java/android/net/lowpan/WrongStateException.java b/lowpan/java/android/net/lowpan/WrongStateException.java new file mode 100644 index 000000000000..35654194e32b --- /dev/null +++ b/lowpan/java/android/net/lowpan/WrongStateException.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.net.lowpan; + +/** + * Exception indicating the interface is the wrong state for an operation. + * + * @see LowpanInterface + * @hide + */ +// @SystemApi +public class WrongStateException extends LowpanException { + + public WrongStateException() {} + + public WrongStateException(String message) { + super(message); + } + + public WrongStateException(String message, Throwable cause) { + super(message, cause); + } + + protected WrongStateException(Exception cause) { + super(cause); + } +} |