Merge "API and boot image updates to import RI BigInteger" am: 47ce951f33 am: 2996c1be22

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331800

Change-Id: I497efcccc6d456789a9b095942681625e93334ff
This commit is contained in:
Hans Boehm
2020-08-13 00:51:24 +00:00
committed by Automerger Merge Worker
3 changed files with 49 additions and 12 deletions

View File

@@ -65646,7 +65646,7 @@ package java.lang.reflect {
package java.math {
public class BigDecimal extends java.lang.Number implements java.lang.Comparable<java.math.BigDecimal> java.io.Serializable {
public class BigDecimal extends java.lang.Number implements java.lang.Comparable<java.math.BigDecimal> {
ctor public BigDecimal(char[], int, int);
ctor public BigDecimal(char[], int, int, java.math.MathContext);
ctor public BigDecimal(char[]);
@@ -65733,19 +65733,20 @@ package java.math {
field public static final java.math.BigDecimal ZERO;
}
public class BigInteger extends java.lang.Number implements java.lang.Comparable<java.math.BigInteger> java.io.Serializable {
public class BigInteger extends java.lang.Number implements java.lang.Comparable<java.math.BigInteger> {
ctor public BigInteger(byte[]);
ctor public BigInteger(int, byte[]);
ctor public BigInteger(@NonNull String, int);
ctor public BigInteger(@NonNull String);
ctor public BigInteger(int, @NonNull java.util.Random);
ctor public BigInteger(int, int, @NonNull java.util.Random);
ctor public BigInteger(@NonNull String);
ctor public BigInteger(@NonNull String, int);
ctor public BigInteger(int, byte[]);
ctor public BigInteger(byte[]);
method @NonNull public java.math.BigInteger abs();
method @NonNull public java.math.BigInteger add(@NonNull java.math.BigInteger);
method @NonNull public java.math.BigInteger and(@NonNull java.math.BigInteger);
method @NonNull public java.math.BigInteger andNot(@NonNull java.math.BigInteger);
method public int bitCount();
method public int bitLength();
method public byte byteValueExact();
method @NonNull public java.math.BigInteger clearBit(int);
method public int compareTo(@NonNull java.math.BigInteger);
method @NonNull public java.math.BigInteger divide(@NonNull java.math.BigInteger);
@@ -65756,8 +65757,10 @@ package java.math {
method @NonNull public java.math.BigInteger gcd(@NonNull java.math.BigInteger);
method public int getLowestSetBit();
method public int intValue();
method public int intValueExact();
method public boolean isProbablePrime(int);
method public long longValue();
method public long longValueExact();
method @NonNull public java.math.BigInteger max(@NonNull java.math.BigInteger);
method @NonNull public java.math.BigInteger min(@NonNull java.math.BigInteger);
method @NonNull public java.math.BigInteger mod(@NonNull java.math.BigInteger);
@@ -65774,6 +65777,7 @@ package java.math {
method @NonNull public java.math.BigInteger setBit(int);
method @NonNull public java.math.BigInteger shiftLeft(int);
method @NonNull public java.math.BigInteger shiftRight(int);
method public short shortValueExact();
method public int signum();
method @NonNull public java.math.BigInteger subtract(@NonNull java.math.BigInteger);
method public boolean testBit(int);

View File

@@ -33630,6 +33630,35 @@ HSPLjava/math/BigInteger;-><init>([B)V
HSPLjava/math/BigInteger;->abs()Ljava/math/BigInteger;
HSPLjava/math/BigInteger;->add(Ljava/math/BigInteger;)Ljava/math/BigInteger;
HSPLjava/math/BigInteger;->bitLength()I
#Temporary manual additions to avoid slowing tests down too much
#Carefully positioned for clean merge
HSPLjava/math/BigInteger;->add([IJ)[I
HSPLjava/math/BigInteger;->add([I[I)[I
HSPLjava/math/BigInteger;->subtract([IJ)[I
HSPLjava/math/BigInteger;->subtract([I[I)[I
HSPLjava/math/BigInteger;->jacobiSymbol(ILjava/math/BigInteger;)I
HSPLjava/math/BigInteger;->lucasLehmerSequence(ILjava/math/BigInteger;Ljava/math/BigInteger;)Ljava/math/BigInteger;
HSPLjava/math/BigInteger;->multiplyToLen([II[II[I)[I
HSPLjava/math/MutableBigInteger;->add(Ljava/math/MutableBigInteger;)V
HSPLjava/math/MutableBigInteger;->addShifted(Ljava/math/MutableBigInteger;)V
HSPLjava/math/MutableBigInteger;->subtract(Ljava/math/MutableBigInteger;)V
HSPLjava/math/MutableBigInteger;->difference(Ljava/math/MutableBigInteger;)V
HSPLjava/math/MutableBigInteger;->divideKnuth(Ljava/math/MutableBigInteger;Ljava/math/MutableBigInteger;Z)Ljava/math/MutableBigInteger;
HSPLjava/math/MutableBigInteger;->divideMagnitude(Ljava/math/MutableBigInteger;Ljava/math/MutableBigInteger;Z)Ljava/math/MutableBigInteger;
HSPLjava/math/MutableBigInteger;->divideLongMagnitude(JLjava/math/MutableBigInteger;)Ljava/math/MutableBigInteger;
HSPLjava/math/MutableBigInteger;->divideOneWord(ILjava/math/MutableBigInteger;)I
HSPLjava/math/MutableBigInteger;->divadd([I[II)I
HSPLjava/math/MutableBigInteger;->mulsub([I[IIII)I
HSPLjava/math/MutableBigInteger;->mulsubBorrow([I[IIII)I
HSPLjava/math/MutableBigInteger;->copyAndShift([III[III)V
HSPLjava/math/MutableBigInteger;->multiply(Ljava/math/MutableBigInteger;Ljava/math/MutableBigInteger;)V
HSPLjava/math/MutableBigInteger;->mul(ILjava/math/MutableBigInteger;)V
HSPLjava/math/MutableBigInteger;->multiply(ILjava/math/MutableBigInteger;)V
HSPLjava/math/MutableBigInteger;->primitiveRightShift(I)I
HSPLjava/math/MutableBigInteger;->primitiveLeftShift(I)I
HSPLjava/math/MutableBigInteger;->binaryGCD(Ljava/math/MutableBigInteger;)Ljava/math/MutableBigInteger;
HSPLjava/math/MutableBigInteger;->binaryGCD(II)I
#End of maual additions
HSPLjava/math/BigInteger;->compareTo(Ljava/math/BigInteger;)I
HSPLjava/math/BigInteger;->divide(Ljava/math/BigInteger;)Ljava/math/BigInteger;
HSPLjava/math/BigInteger;->divideAndRemainder(Ljava/math/BigInteger;)[Ljava/math/BigInteger;

View File

@@ -63807,7 +63807,7 @@ package java.lang.reflect {
package java.math {
public class BigDecimal extends java.lang.Number implements java.lang.Comparable<java.math.BigDecimal> java.io.Serializable {
public class BigDecimal extends java.lang.Number implements java.lang.Comparable<java.math.BigDecimal> {
ctor public BigDecimal(char[], int, int);
ctor public BigDecimal(char[], int, int, java.math.MathContext);
ctor public BigDecimal(char[]);
@@ -63894,19 +63894,20 @@ package java.math {
field public static final java.math.BigDecimal ZERO;
}
public class BigInteger extends java.lang.Number implements java.lang.Comparable<java.math.BigInteger> java.io.Serializable {
public class BigInteger extends java.lang.Number implements java.lang.Comparable<java.math.BigInteger> {
ctor public BigInteger(byte[]);
ctor public BigInteger(int, byte[]);
ctor public BigInteger(@NonNull String, int);
ctor public BigInteger(@NonNull String);
ctor public BigInteger(int, @NonNull java.util.Random);
ctor public BigInteger(int, int, @NonNull java.util.Random);
ctor public BigInteger(@NonNull String);
ctor public BigInteger(@NonNull String, int);
ctor public BigInteger(int, byte[]);
ctor public BigInteger(byte[]);
method @NonNull public java.math.BigInteger abs();
method @NonNull public java.math.BigInteger add(@NonNull java.math.BigInteger);
method @NonNull public java.math.BigInteger and(@NonNull java.math.BigInteger);
method @NonNull public java.math.BigInteger andNot(@NonNull java.math.BigInteger);
method public int bitCount();
method public int bitLength();
method public byte byteValueExact();
method @NonNull public java.math.BigInteger clearBit(int);
method public int compareTo(@NonNull java.math.BigInteger);
method @NonNull public java.math.BigInteger divide(@NonNull java.math.BigInteger);
@@ -63917,8 +63918,10 @@ package java.math {
method @NonNull public java.math.BigInteger gcd(@NonNull java.math.BigInteger);
method public int getLowestSetBit();
method public int intValue();
method public int intValueExact();
method public boolean isProbablePrime(int);
method public long longValue();
method public long longValueExact();
method @NonNull public java.math.BigInteger max(@NonNull java.math.BigInteger);
method @NonNull public java.math.BigInteger min(@NonNull java.math.BigInteger);
method @NonNull public java.math.BigInteger mod(@NonNull java.math.BigInteger);
@@ -63935,6 +63938,7 @@ package java.math {
method @NonNull public java.math.BigInteger setBit(int);
method @NonNull public java.math.BigInteger shiftLeft(int);
method @NonNull public java.math.BigInteger shiftRight(int);
method public short shortValueExact();
method public int signum();
method @NonNull public java.math.BigInteger subtract(@NonNull java.math.BigInteger);
method public boolean testBit(int);