Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94fb5cf2 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge changes from topic "nov6" into main 

* changes:
  Support android.util.proto under Ravenwood.
  More android.util in Ravenwood, supported by CTS.
  More android.util in Ravenwood, supported by CTS.
parents 484f8bcb 37ddff60

core/java/android/util/ArraySet.java

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ import android.annotation.Nullable; 
import android.annotation.TestApi;

import android.compat.annotation.UnsupportedAppUsage;



import libcore.util.EmptyArray;



import java.lang.reflect.Array;

import java.util.Arrays;

import java.util.Collection;

core/java/android/util/Base64.java

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import java.io.UnsupportedEncodingException; 
 * href="http://www.ietf.org/rfc/rfc2045.txt">2045</a> and <a

 * href="http://www.ietf.org/rfc/rfc3548.txt">3548</a>.

 */

@android.ravenwood.annotations.RavenwoodWholeClassKeep

public class Base64 {

    /**

     * Default values for encoder/decoder flags.

core/java/android/util/IntArray.java

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ package android.util; 
import com.android.internal.util.ArrayUtils;

import com.android.internal.util.Preconditions;



import libcore.util.EmptyArray;



import java.util.Arrays;



/**

core/java/android/util/LongArray.java

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ import android.os.Build; 
import com.android.internal.util.ArrayUtils;

import com.android.internal.util.Preconditions;



import libcore.util.EmptyArray;



import java.util.Arrays;



/**

core/java/android/util/LongArrayQueue.java

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ package android.util; 
import com.android.internal.util.ArrayUtils;

import com.android.internal.util.GrowingArrayUtils;



import libcore.util.EmptyArray;



import java.util.NoSuchElementException;



/**