summaryrefslogtreecommitdiffstats
path: root/luni/src/main/java/javax/crypto
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2011-01-13 16:23:08 -0800
committerElliott Hughes <enh@google.com>2011-01-13 17:36:23 -0800
commitfb0ec0e650bf8be35acb0d47da0311a7c446aa33 (patch)
treeb5803eda5892295108e04736abb13f9cb8e71b2a /luni/src/main/java/javax/crypto
parentd2c2ba1d2bcb5e3697012794f2273880b6c7337d (diff)
downloadlibcore-fb0ec0e650bf8be35acb0d47da0311a7c446aa33.zip
libcore-fb0ec0e650bf8be35acb0d47da0311a7c446aa33.tar.gz
libcore-fb0ec0e650bf8be35acb0d47da0311a7c446aa33.tar.bz2
Remove useless android-changed comments.
I've changed useful ones to regular comments or TODOs, as appropriate. I've left ones in code like java.util.concurrent where we really are tracking an upstream source, making the change markers useful. I've left a handful of others where I intend to actually investigate the implied TODOs before deciding how to resolve them. Change-Id: Iaf71059b818596351cf8ee5a3cf3c85586051fa6
Diffstat (limited to 'luni/src/main/java/javax/crypto')
-rw-r--r--luni/src/main/java/javax/crypto/SealedObject.java2
-rw-r--r--luni/src/main/java/javax/crypto/spec/SecretKeySpec.java2
2 files changed, 0 insertions, 4 deletions
diff --git a/luni/src/main/java/javax/crypto/SealedObject.java b/luni/src/main/java/javax/crypto/SealedObject.java
index c6f8221..c9c1534 100644
--- a/luni/src/main/java/javax/crypto/SealedObject.java
+++ b/luni/src/main/java/javax/crypto/SealedObject.java
@@ -146,11 +146,9 @@ public class SealedObject implements Serializable {
public final Object getObject(Key key)
throws IOException, ClassNotFoundException,
NoSuchAlgorithmException, InvalidKeyException {
- // BEGIN android-added
if (key == null) {
throw new InvalidKeyException("key == null");
}
- // END android-added
try {
Cipher cipher = Cipher.getInstance(sealAlg);
if ((paramsAlg != null) && (paramsAlg.length() != 0)) {
diff --git a/luni/src/main/java/javax/crypto/spec/SecretKeySpec.java b/luni/src/main/java/javax/crypto/spec/SecretKeySpec.java
index 99701ff..cb70643 100644
--- a/luni/src/main/java/javax/crypto/spec/SecretKeySpec.java
+++ b/luni/src/main/java/javax/crypto/spec/SecretKeySpec.java
@@ -98,11 +98,9 @@ public class SecretKeySpec implements SecretKey, KeySpec, Serializable {
if (key.length == 0) {
throw new IllegalArgumentException("key.length == 0");
}
- // BEGIN android-changed
if (len < 0 || offset < 0) {
throw new ArrayIndexOutOfBoundsException("len < 0 || offset < 0");
}
- // END android-changed
if (key.length - offset < len) {
throw new IllegalArgumentException("key too short");
}