commit c76cc000040e32adcb95e71157db2bfde8f73817
author Neil Fuller <nfuller@google.com> Wed Apr 10 09:54:30 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 10 09:54:30 2019 +0000
tree 5ecd18653d78ffa910f86ab8e657f1c6e0751945
parent 9a343327ff5f93d3df7b2f8b19d3aa6979c077ff
parent cd22105cf1e520c9c6d29da7f8f12cb77118ab84

Merge "Add decode() overload to the CorePlatformAPI"

luni/src/main/java/libcore/util/HexEncoding.java

diff --git a/luni/src/main/java/libcore/util/HexEncoding.java b/luni/src/main/java/libcore/util/HexEncoding.java
index f5eed4f..ef54bb9 100644
--- a/luni/src/main/java/libcore/util/HexEncoding.java
+++ b/luni/src/main/java/libcore/util/HexEncoding.java
@@ -120,6 +120,7 @@
      *
      * Throws an {@code IllegalArgumentException} if the input is malformed.
      */
+    @libcore.api.CorePlatformApi
     public static byte[] decode(String encoded, boolean allowSingleChar) throws IllegalArgumentException {
         return decode(encoded.toCharArray(), allowSingleChar);
     }

mmodules/core_platform_api/api/platform/current-api.txt

diff --git a/mmodules/core_platform_api/api/platform/current-api.txt b/mmodules/core_platform_api/api/platform/current-api.txt
index ec28ddf..0558d1d 100644
--- a/mmodules/core_platform_api/api/platform/current-api.txt
+++ b/mmodules/core_platform_api/api/platform/current-api.txt
@@ -1223,6 +1223,7 @@
 
   public class HexEncoding {
     method public static byte[] decode(String) throws java.lang.IllegalArgumentException;
+    method public static byte[] decode(String, boolean) throws java.lang.IllegalArgumentException;
     method public static byte[] decode(char[]) throws java.lang.IllegalArgumentException;
     method public static byte[] decode(char[], boolean) throws java.lang.IllegalArgumentException;
     method public static char[] encode(byte[]);