diff options
| author | Doug Zongker <dougz@android.com> | 2010-02-05 05:44:17 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-05 05:44:17 -0800 |
| commit | 17fe395dab5aa80241e2e6e75100e7936746aa56 (patch) | |
| tree | 49eae062566253200d7257425af5ed76b46cc4c3 /common/java | |
| parent | f6e003bc4a885c186a023bd46beaaafa3842cf51 (diff) | |
| parent | e2127fb4866681d9850fa9de9512d8c7891e624e (diff) | |
| download | frameworks_base-17fe395dab5aa80241e2e6e75100e7936746aa56.zip frameworks_base-17fe395dab5aa80241e2e6e75100e7936746aa56.tar.gz frameworks_base-17fe395dab5aa80241e2e6e75100e7936746aa56.tar.bz2 | |
Merge "rename encodeString to encodeToString"
Diffstat (limited to 'common/java')
| -rw-r--r-- | common/java/com/android/common/Base64.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/java/com/android/common/Base64.java b/common/java/com/android/common/Base64.java index d108f44..0c8e7c1 100644 --- a/common/java/com/android/common/Base64.java +++ b/common/java/com/android/common/Base64.java @@ -365,7 +365,7 @@ public class Base64 { * Passing 0 results in output that adheres to RFC * 2045. */ - public static String encodeString(byte[] input, int flags) { + public static String encodeToString(byte[] input, int flags) { return new String(encode(input, flags)); } @@ -381,7 +381,7 @@ public class Base64 { * Passing 0 results in output that adheres to RFC * 2045. */ - public static String encodeString(byte[] input, int offset, int len, int flags) { + public static String encodeToString(byte[] input, int offset, int len, int flags) { return new String(encode(input, offset, len, flags)); } |