drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix array-related errorprone warnings

Browse Source 
The ArrayEquals, ArrayHashCode, ArrayToString, and
ArraysAsListPrimitiveArray errorprone findings were
demoted from errors to warnings. Fix existing
occurrences of them so they can be made errors again.

Bug: 242630963
Test: RUN_ERROR_PRONE=true m javac-check
Change-Id: Ia6f216cc36ad0a5758f39fd9b34962cd4adf9d8e
This commit is contained in:
Cole Faust 2022-08-15 15:03:05 -07:00
parent b09fa7a106
commit 584140c83a
53 changed files with 266 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Android.bp
View File

@ -367,6 +367,15 @@ java_library {
name: "framework-minus-apex-intdefs",
defaults: ["framework-minus-apex-defaults"],
plugins: ["intdef-annotation-processor"],
// Errorprone and android lint will already run on framework-minus-apex, don't rerun them on
// the intdefs version in order to speed up the build.
errorprone: {
enabled: false,
},
lint: {
enabled: false,
},
}
// This "framework" module is NOT installed to the device. It's

2
apct-tests/perftests/blobstore/src/com/android/perftests/blob/BlobStorePerfTests.java
View File

@ -257,7 +257,7 @@ public class BlobStorePerfTests {
runShellCommand(String.format(
"cmd blob_store delete-blob --algo %s --digest %s --label %s --expiry %d --tag %s",
blobHandle.algorithm,
Base64.getEncoder().encode(blobHandle.digest),
Base64.getEncoder().encodeToString(blobHandle.digest),
blobHandle.label,
blobHandle.expiryTimeMillis,
blobHandle.tag));

6
core/java/android/app/VoiceInteractor.java
View File

@ -43,6 +43,7 @@ import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Objects;
import java.util.concurrent.Executor;
@ -1103,7 +1104,10 @@ public final class VoiceInteractor {
}
try {
boolean[] res = mInteractor.supportsCommands(mContext.getOpPackageName(), commands);
if (DEBUG) Log.d(TAG, "supportsCommands: cmds=" + commands + " res=" + res);
if (DEBUG) {
Log.d(TAG, "supportsCommands: cmds=" + Arrays.toString(commands) + " res="
+ Arrays.toString(res));
}
return res;
} catch (RemoteException e) {
throw new RuntimeException("Voice interactor has died", e);

11
core/java/android/app/admin/PreferentialNetworkServiceConfig.java
View File

@ -203,17 +203,14 @@ public final class PreferentialNetworkServiceConfig implements Parcelable {
return mIsEnabled == that.mIsEnabled
&& mAllowFallbackToDefaultConnection == that.mAllowFallbackToDefaultConnection
&& mNetworkId == that.mNetworkId
&& Objects.equals(mIncludedUids, that.mIncludedUids)
&& Objects.equals(mExcludedUids, that.mExcludedUids);
&& Arrays.equals(mIncludedUids, that.mIncludedUids)
&& Arrays.equals(mExcludedUids, that.mExcludedUids);
}
@Override
public int hashCode() {
return ((Objects.hashCode(mIsEnabled) * 17)
+ (Objects.hashCode(mAllowFallbackToDefaultConnection) * 19)
+ (Objects.hashCode(mIncludedUids) * 23)
+ (Objects.hashCode(mExcludedUids) * 29)
+ mNetworkId * 31);
return Objects.hash(mIsEnabled, mAllowFallbackToDefaultConnection,
Arrays.hashCode(mIncludedUids), Arrays.hashCode(mExcludedUids), mNetworkId);
}
/**

7
core/java/android/companion/BluetoothLeDeviceFilter.java
View File

@ -204,9 +204,10 @@ public final class BluetoothLeDeviceFilter implements DeviceFilter<ScanResult> {
@Override
public int hashCode() {
return Objects.hash(mNamePattern, mScanFilter, mRawDataFilter, mRawDataFilterMask,
mRenamePrefix, mRenameSuffix, mRenameBytesFrom, mRenameBytesLength,
mRenameNameFrom, mRenameNameLength, mRenameBytesReverseOrder);
return Objects.hash(mNamePattern, mScanFilter, Arrays.hashCode(mRawDataFilter),
Arrays.hashCode(mRawDataFilterMask), mRenamePrefix, mRenameSuffix,
mRenameBytesFrom, mRenameBytesLength, mRenameNameFrom, mRenameNameLength,
mRenameBytesReverseOrder);
}
@Override

11
core/java/android/content/AttributionSource.java
View File

@ -495,14 +495,9 @@ public final class AttributionSource implements Parcelable {
@Override
public int hashCode() {
int _hash = 1;
_hash = 31 * _hash + mAttributionSourceState.uid;
_hash = 31 * _hash + Objects.hashCode(mAttributionSourceState.packageName);
_hash = 31 * _hash + Objects.hashCode(mAttributionSourceState.attributionTag);
_hash = 31 * _hash + Objects.hashCode(mAttributionSourceState.token);
_hash = 31 * _hash + Objects.hashCode(mAttributionSourceState.renouncedPermissions);
_hash = 31 * _hash + Objects.hashCode(getNext());
return _hash;
return Objects.hash(mAttributionSourceState.uid, mAttributionSourceState.packageName,
mAttributionSourceState.attributionTag, mAttributionSourceState.token,
Arrays.hashCode(mAttributionSourceState.renouncedPermissions), getNext());
}
@Override

12
core/java/android/content/pm/LauncherApps.java
View File

@ -1723,7 +1723,8 @@ public class LauncherApps {
public void onPackagesAvailable(UserHandle user, String[] packageNames, boolean replacing)
throws RemoteException {
if (DEBUG) {
Log.d(TAG, "onPackagesAvailable " + user.getIdentifier() + "," + packageNames);
Log.d(TAG, "onPackagesAvailable " + user.getIdentifier() + ","
+ Arrays.toString(packageNames));
}
synchronized (LauncherApps.this) {
for (CallbackMessageHandler callback : mCallbacks) {
@ -1736,7 +1737,8 @@ public class LauncherApps {
public void onPackagesUnavailable(UserHandle user, String[] packageNames, boolean replacing)
throws RemoteException {
if (DEBUG) {
Log.d(TAG, "onPackagesUnavailable " + user.getIdentifier() + "," + packageNames);
Log.d(TAG, "onPackagesUnavailable " + user.getIdentifier() + ","
+ Arrays.toString(packageNames));
}
synchronized (LauncherApps.this) {
for (CallbackMessageHandler callback : mCallbacks) {
@ -1750,7 +1752,8 @@ public class LauncherApps {
Bundle launcherExtras)
throws RemoteException {
if (DEBUG) {
Log.d(TAG, "onPackagesSuspended " + user.getIdentifier() + "," + packageNames);
Log.d(TAG, "onPackagesSuspended " + user.getIdentifier() + ","
+ Arrays.toString(packageNames));
}
synchronized (LauncherApps.this) {
for (CallbackMessageHandler callback : mCallbacks) {
@ -1763,7 +1766,8 @@ public class LauncherApps {
public void onPackagesUnsuspended(UserHandle user, String[] packageNames)
throws RemoteException {
if (DEBUG) {
Log.d(TAG, "onPackagesUnsuspended " + user.getIdentifier() + "," + packageNames);
Log.d(TAG, "onPackagesUnsuspended " + user.getIdentifier() + ","
+ Arrays.toString(packageNames));
}
synchronized (LauncherApps.this) {
for (CallbackMessageHandler callback : mCallbacks) {

3
core/java/android/content/pm/ShortcutInfo.java
View File

@ -53,6 +53,7 @@ import com.android.internal.util.Preconditions;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@ -2617,7 +2618,7 @@ public final class ShortcutInfo implements Parcelable {
addIndentOrComma(sb, indent);
sb.append("persons=");
sb.append(mPersons);
sb.append(Arrays.toString(mPersons));
addIndentOrComma(sb, indent);

16
core/java/android/content/res/GradientColor.java
View File

@ -22,13 +22,6 @@ import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.pm.ActivityInfo.Config;
import android.content.res.Resources.Theme;
import com.android.internal.R;
import com.android.internal.util.GrowingArrayUtils;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import android.graphics.LinearGradient;
import android.graphics.RadialGradient;
import android.graphics.Shader;
@ -38,9 +31,16 @@ import android.util.AttributeSet;
import android.util.Log;
import android.util.Xml;
import com.android.internal.R;
import com.android.internal.util.GrowingArrayUtils;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import java.io.IOException;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.Arrays;
/**
* Lets you define a gradient color, which is used inside
@ -466,7 +466,7 @@ public class GradientColor extends ComplexColor {
}
if (tempColors.length < 2) {
Log.w(TAG, "<gradient> tag requires 2 color values specified!" + tempColors.length
+ " " + tempColors);
+ " " + Arrays.toString(tempColors));
}
if (mGradientType == GradientDrawable.LINEAR_GRADIENT) {

8
core/java/android/hardware/radio/ProgramSelector.java
View File

@ -490,8 +490,12 @@ public final class ProgramSelector implements Parcelable {
public String toString() {
StringBuilder sb = new StringBuilder("ProgramSelector(type=").append(mProgramType)
.append(", primary=").append(mPrimaryId);
if (mSecondaryIds.length > 0) sb.append(", secondary=").append(mSecondaryIds);
if (mVendorIds.length > 0) sb.append(", vendor=").append(mVendorIds);
if (mSecondaryIds.length > 0) {
sb.append(", secondary=").append(Arrays.toString(mSecondaryIds));
}
if (mVendorIds.length > 0) {
sb.append(", vendor=").append(Arrays.toString(mVendorIds));
}
sb.append(")");
return sb.toString();
}

5
core/java/android/hardware/radio/RadioManager.java
View File

@ -505,7 +505,8 @@ public class RadioManager {
public int hashCode() {
return Objects.hash(mId, mServiceName, mClassId, mImplementor, mProduct, mVersion,
mSerial, mNumTuners, mNumAudioSources, mIsInitializationRequired,
mIsCaptureSupported, mBands, mIsBgScanSupported, mDabFrequencyTable, mVendorInfo);
mIsCaptureSupported, Arrays.hashCode(mBands), mIsBgScanSupported,
mDabFrequencyTable, mVendorInfo);
}
@Override
@ -525,7 +526,7 @@ public class RadioManager {
if (mNumAudioSources != other.mNumAudioSources) return false;
if (mIsInitializationRequired != other.mIsInitializationRequired) return false;
if (mIsCaptureSupported != other.mIsCaptureSupported) return false;
if (!Objects.equals(mBands, other.mBands)) return false;
if (!Arrays.equals(mBands, other.mBands)) return false;
if (mIsBgScanSupported != other.mIsBgScanSupported) return false;
if (!Objects.equals(mDabFrequencyTable, other.mDabFrequencyTable)) return false;
if (!Objects.equals(mVendorInfo, other.mVendorInfo)) return false;

3
core/java/android/metrics/LogMaker.java
View File

@ -23,6 +23,7 @@ import android.util.SparseArray;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import java.util.Arrays;
/**
@ -395,7 +396,7 @@ public class LogMaker {
out[i * 2] = entries.keyAt(i);
out[i * 2 + 1] = entries.valueAt(i);
}
int size = out.toString().getBytes().length;
int size = Arrays.toString(out).getBytes().length;
if (size > MAX_SERIALIZED_SIZE) {
Log.i(TAG, "Log line too long, did not emit: " + size + " bytes.");
throw new RuntimeException();

3
core/java/android/os/incremental/IncrementalStorage.java
View File

@ -26,6 +26,7 @@ import android.os.RemoteException;
import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.Objects;
import java.util.UUID;
@ -515,7 +516,7 @@ public final class IncrementalStorage {
throw new IOException("Unsupported log2BlockSize: " + hashingInfo.log2BlockSize);
}
if (hashingInfo.salt != null && hashingInfo.salt.length > 0) {
throw new IOException("Unsupported salt: " + hashingInfo.salt);
throw new IOException("Unsupported salt: " + Arrays.toString(hashingInfo.salt));
}
if (hashingInfo.rawRootHash.length != INCFS_MAX_HASH_SIZE) {
throw new IOException("rawRootHash has to be " + INCFS_MAX_HASH_SIZE + " bytes");

5
core/java/android/service/autofill/OptionalValidators.java
View File

@ -25,6 +25,8 @@ import android.util.Log;
import com.android.internal.util.Preconditions;
import java.util.Arrays;
/**
* Compound validator that returns {@code true} on {@link #isValid(ValueFinder)} if any
* of its subvalidators returns {@code true} as well.
@ -61,7 +63,8 @@ final class OptionalValidators extends InternalValidator {
public String toString() {
if (!sDebug) return super.toString();
return new StringBuilder("OptionalValidators: [validators=").append(mValidators)
return new StringBuilder("OptionalValidators: [validators=")
.append(Arrays.toString(mValidators))
.append("]")
.toString();
}

5
core/java/android/service/autofill/RequiredValidators.java
View File

@ -25,6 +25,8 @@ import android.util.Log;
import com.android.internal.util.Preconditions;
import java.util.Arrays;
/**
* Compound validator that only returns {@code true} on {@link #isValid(ValueFinder)} if all
* of its subvalidators return {@code true} as well.
@ -60,7 +62,8 @@ final class RequiredValidators extends InternalValidator {
public String toString() {
if (!sDebug) return super.toString();
return new StringBuilder("RequiredValidators: [validators=").append(mValidators)
return new StringBuilder("RequiredValidators: [validators=")
.append(Arrays.toString(mValidators))
.append("]")
.toString();
}

3
core/java/android/service/voice/VoiceInteractionSession.java
View File

@ -73,6 +73,7 @@ import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@ -597,7 +598,7 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
VoiceInteractor.PickOptionRequest.Option[] selections, Bundle result) {
try {
if (DEBUG) Log.d(TAG, "sendPickOptionResult: req=" + mInterface
+ " finished=" + finished + " selections=" + selections
+ " finished=" + finished + " selections=" + Arrays.toString(selections)
+ " result=" + result);
if (finished) {
finishRequest();

5
core/java/android/speech/tts/FileSynthesisCallback.java
View File

@ -24,6 +24,7 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.channels.FileChannel;
import java.util.Arrays;
/**
* Speech synthesis request that writes the audio to a WAV file.
@ -152,8 +153,8 @@ class FileSynthesisCallback extends AbstractSynthesisCallback {
@Override
public int audioAvailable(byte[] buffer, int offset, int length) {
if (DBG) {
Log.d(TAG, "FileSynthesisRequest.audioAvailable(" + buffer + "," + offset
+ "," + length + ")");
Log.d(TAG, "FileSynthesisRequest.audioAvailable(" + Arrays.toString(buffer)
+ "," + offset + "," + length + ")");
}
FileChannel fileChannel = null;
synchronized (mStateLock) {

17
core/java/android/util/ArrayMap.java
View File

@ -23,6 +23,7 @@ import com.android.internal.util.ArrayUtils;
import libcore.util.EmptyArray;
import java.util.Arrays;
import java.util.Collection;
import java.util.ConcurrentModificationException;
import java.util.Map;
@ -231,7 +232,7 @@ public final class ArrayMap<K, V> implements Map<K, V> {
array[0] = array[1] = null;
mTwiceBaseCacheSize--;
if (DEBUG) {
Log.d(TAG, "Retrieving 2x cache " + mHashes
Log.d(TAG, "Retrieving 2x cache " + Arrays.toString(mHashes)
+ " now have " + mTwiceBaseCacheSize + " entries");
}
return;
@ -258,7 +259,7 @@ public final class ArrayMap<K, V> implements Map<K, V> {
array[0] = array[1] = null;
mBaseCacheSize--;
if (DEBUG) {
Log.d(TAG, "Retrieving 1x cache " + mHashes
Log.d(TAG, "Retrieving 1x cache " + Arrays.toString(mHashes)
+ " now have " + mBaseCacheSize + " entries");
}
return;
@ -295,8 +296,10 @@ public final class ArrayMap<K, V> implements Map<K, V> {
}
mTwiceBaseCache = array;
mTwiceBaseCacheSize++;
if (DEBUG) Log.d(TAG, "Storing 2x cache " + array
+ " now have " + mTwiceBaseCacheSize + " entries");
if (DEBUG) {
Log.d(TAG, "Storing 2x cache " + Arrays.toString(array)
+ " now have " + mTwiceBaseCacheSize + " entries");
}
}
}
} else if (hashes.length == BASE_SIZE) {
@ -309,8 +312,10 @@ public final class ArrayMap<K, V> implements Map<K, V> {
}
mBaseCache = array;
mBaseCacheSize++;
if (DEBUG) Log.d(TAG, "Storing 1x cache " + array
+ " now have " + mBaseCacheSize + " entries");
if (DEBUG) {
Log.d(TAG, "Storing 1x cache " + Arrays.toString(array)
+ " now have " + mBaseCacheSize + " entries");
}
}
}
}

15
core/java/android/util/ArraySet.java
View File

@ -23,6 +23,7 @@ import android.compat.annotation.UnsupportedAppUsage;
import libcore.util.EmptyArray;
import java.lang.reflect.Array;
import java.util.Arrays;
import java.util.Collection;
import java.util.ConcurrentModificationException;
import java.util.Iterator;
@ -194,8 +195,8 @@ public final class ArraySet<E> implements Collection<E>, Set<E> {
array[0] = array[1] = null;
sTwiceBaseCacheSize--;
if (DEBUG) {
Log.d(TAG, "Retrieving 2x cache " + mHashes + " now have "
+ sTwiceBaseCacheSize + " entries");
Log.d(TAG, "Retrieving 2x cache " + Arrays.toString(mHashes)
+ " now have " + sTwiceBaseCacheSize + " entries");
}
return;
}
@ -221,8 +222,8 @@ public final class ArraySet<E> implements Collection<E>, Set<E> {
array[0] = array[1] = null;
sBaseCacheSize--;
if (DEBUG) {
Log.d(TAG, "Retrieving 1x cache " + mHashes + " now have "
+ sBaseCacheSize + " entries");
Log.d(TAG, "Retrieving 1x cache " + Arrays.toString(mHashes)
+ " now have " + sBaseCacheSize + " entries");
}
return;
}
@ -259,8 +260,8 @@ public final class ArraySet<E> implements Collection<E>, Set<E> {
sTwiceBaseCache = array;
sTwiceBaseCacheSize++;
if (DEBUG) {
Log.d(TAG, "Storing 2x cache " + array + " now have " + sTwiceBaseCacheSize
+ " entries");
Log.d(TAG, "Storing 2x cache " + Arrays.toString(array) + " now have "
+ sTwiceBaseCacheSize + " entries");
}
}
}
@ -275,7 +276,7 @@ public final class ArraySet<E> implements Collection<E>, Set<E> {
sBaseCache = array;
sBaseCacheSize++;
if (DEBUG) {
Log.d(TAG, "Storing 1x cache " + array + " now have "
Log.d(TAG, "Storing 1x cache " + Arrays.toString(array) + " now have "
+ sBaseCacheSize + " entries");
}
}

33
core/java/android/util/proto/ProtoInputStream.java
View File

@ -21,6 +21,8 @@ import android.util.LongArray;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Objects;
/**
* Class to read to a protobuf stream.
@ -968,26 +970,17 @@ public final class ProtoInputStream extends ProtoStream {
public String dumpDebugData() {
StringBuilder sb = new StringBuilder();
sb.append("\nmFieldNumber : 0x" + Integer.toHexString(mFieldNumber));
sb.append("\nmWireType : 0x" + Integer.toHexString(mWireType));
sb.append("\nmState : 0x" + Integer.toHexString(mState));
sb.append("\nmDiscardedBytes : 0x" + Integer.toHexString(mDiscardedBytes));
sb.append("\nmOffset : 0x" + Integer.toHexString(mOffset));
sb.append("\nmExpectedObjectTokenStack : ");
if (mExpectedObjectTokenStack == null) {
sb.append("null");
} else {
sb.append(mExpectedObjectTokenStack);
}
sb.append("\nmDepth : 0x" + Integer.toHexString(mDepth));
sb.append("\nmBuffer : ");
if (mBuffer == null) {
sb.append("null");
} else {
sb.append(mBuffer);
}
sb.append("\nmBufferSize : 0x" + Integer.toHexString(mBufferSize));
sb.append("\nmEnd : 0x" + Integer.toHexString(mEnd));
sb.append("\nmFieldNumber : 0x").append(Integer.toHexString(mFieldNumber));
sb.append("\nmWireType : 0x").append(Integer.toHexString(mWireType));
sb.append("\nmState : 0x").append(Integer.toHexString(mState));
sb.append("\nmDiscardedBytes : 0x").append(Integer.toHexString(mDiscardedBytes));
sb.append("\nmOffset : 0x").append(Integer.toHexString(mOffset));
sb.append("\nmExpectedObjectTokenStack : ")
.append(Objects.toString(mExpectedObjectTokenStack));
sb.append("\nmDepth : 0x").append(Integer.toHexString(mDepth));
sb.append("\nmBuffer : ").append(Arrays.toString(mBuffer));
sb.append("\nmBufferSize : 0x").append(Integer.toHexString(mBufferSize));
sb.append("\nmEnd : 0x").append(Integer.toHexString(mEnd));
return sb.toString();
}

23
core/java/android/util/proto/ProtoUtils.java
View File

@ -20,6 +20,7 @@ import android.util.AggStats;
import android.util.Duration;
import java.io.IOException;
import java.util.Arrays;
/**
* This class contains a list of helper functions to write common proto in
@ -91,27 +92,27 @@ public class ProtoUtils {
final int wireType = proto.getWireType();
long fieldConstant;
sb.append("Offset : 0x" + Integer.toHexString(proto.getOffset()));
sb.append("\nField Number : 0x" + Integer.toHexString(proto.getFieldNumber()));
sb.append("Offset : 0x").append(Integer.toHexString(proto.getOffset()));
sb.append("\nField Number : 0x").append(Integer.toHexString(proto.getFieldNumber()));
sb.append("\nWire Type : ");
switch (wireType) {
case ProtoStream.WIRE_TYPE_VARINT:
sb.append("varint");
fieldConstant = ProtoStream.makeFieldId(fieldNumber,
ProtoStream.FIELD_COUNT_SINGLE | ProtoStream.FIELD_TYPE_INT64);
sb.append("\nField Value : 0x" + Long.toHexString(proto.readLong(fieldConstant)));
sb.append("varint\nField Value : 0x");
sb.append(Long.toHexString(proto.readLong(fieldConstant)));
break;
case ProtoStream.WIRE_TYPE_FIXED64:
sb.append("fixed64");
fieldConstant = ProtoStream.makeFieldId(fieldNumber,
ProtoStream.FIELD_COUNT_SINGLE | ProtoStream.FIELD_TYPE_FIXED64);
sb.append("\nField Value : 0x" + Long.toHexString(proto.readLong(fieldConstant)));
sb.append("fixed64\nField Value : 0x");
sb.append(Long.toHexString(proto.readLong(fieldConstant)));
break;
case ProtoStream.WIRE_TYPE_LENGTH_DELIMITED:
sb.append("length delimited");
fieldConstant = ProtoStream.makeFieldId(fieldNumber,
ProtoStream.FIELD_COUNT_SINGLE | ProtoStream.FIELD_TYPE_BYTES);
sb.append("\nField Bytes : " + proto.readBytes(fieldConstant));
sb.append("length delimited\nField Bytes : ");
sb.append(Arrays.toString(proto.readBytes(fieldConstant)));
break;
case ProtoStream.WIRE_TYPE_START_GROUP:
sb.append("start group");
@ -120,13 +121,13 @@ public class ProtoUtils {
sb.append("end group");
break;
case ProtoStream.WIRE_TYPE_FIXED32:
sb.append("fixed32");
fieldConstant = ProtoStream.makeFieldId(fieldNumber,
ProtoStream.FIELD_COUNT_SINGLE | ProtoStream.FIELD_TYPE_FIXED32);
sb.append("\nField Value : 0x" + Integer.toHexString(proto.readInt(fieldConstant)));
sb.append("fixed32\nField Value : 0x");
sb.append(Integer.toHexString(proto.readInt(fieldConstant)));
break;
default:
sb.append("unknown(" + proto.getWireType() + ")");
sb.append("unknown(").append(proto.getWireType()).append(")");
}
return sb.toString();
}

2
core/java/android/view/SurfaceControl.java
View File

@ -1934,7 +1934,7 @@ public final class SurfaceControl implements Parcelable {
@Override
public int hashCode() {
return Objects.hash(supportedDisplayModes, activeDisplayModeId, activeDisplayModeId,
return Objects.hash(Arrays.hashCode(supportedDisplayModes), activeDisplayModeId,
activeColorMode, hdrCapabilities);
}
}

21
core/java/com/android/internal/os/BatteryStatsImpl.java
View File

@ -7928,20 +7928,31 @@ public class BatteryStatsImpl extends BatteryStats {
synchronized (mModemNetworkLock) {
if (displayTransport == TRANSPORT_CELLULAR) {
mModemIfaces = includeInStringArray(mModemIfaces, iface);
if (DEBUG) Slog.d(TAG, "Note mobile iface " + iface + ": " + mModemIfaces);
if (DEBUG) {
Slog.d(TAG, "Note mobile iface " + iface + ": "
+ Arrays.toString(mModemIfaces));
}
} else {
mModemIfaces = excludeFromStringArray(mModemIfaces, iface);
if (DEBUG) Slog.d(TAG, "Note non-mobile iface " + iface + ": " + mModemIfaces);
if (DEBUG) {
Slog.d(TAG, "Note non-mobile iface " + iface + ": "
+ Arrays.toString(mModemIfaces));
}
}
}
synchronized (mWifiNetworkLock) {
if (displayTransport == TRANSPORT_WIFI) {
mWifiIfaces = includeInStringArray(mWifiIfaces, iface);
if (DEBUG) Slog.d(TAG, "Note wifi iface " + iface + ": " + mWifiIfaces);
if (DEBUG) {
Slog.d(TAG, "Note wifi iface " + iface + ": " + Arrays.toString(mWifiIfaces));
}
} else {
mWifiIfaces = excludeFromStringArray(mWifiIfaces, iface);
if (DEBUG) Slog.d(TAG, "Note non-wifi iface " + iface + ": " + mWifiIfaces);
if (DEBUG) {
Slog.d(TAG, "Note non-wifi iface " + iface + ": "
+ Arrays.toString(mWifiIfaces));
}
}
}
}
@ -14409,7 +14420,7 @@ public class BatteryStatsImpl extends BatteryStats {
@NonNull CpuDeltaPowerAccumulator accumulator) {
if (DEBUG_ENERGY) {
Slog.d(TAG,
"Updating cpu cluster stats: " + clusterChargeUC.toString());
"Updating cpu cluster stats: " + Arrays.toString(clusterChargeUC));
}
if (mGlobalMeasuredEnergyStats == null) {
return;

3
core/java/com/android/internal/widget/LockscreenCredential.java
View File

@ -26,7 +26,6 @@ import android.annotation.NonNull;
import android.annotation.Nullable;
import android.os.Parcel;
import android.os.Parcelable;
import android.os.storage.StorageManager;
import android.text.TextUtils;
import com.android.internal.util.Preconditions;
@ -368,7 +367,7 @@ public class LockscreenCredential implements Parcelable, AutoCloseable {
@Override
public int hashCode() {
// Effective Java — Always override hashCode when you override equals
return (17 + mType) * 31 + mCredential.hashCode();
return Objects.hash(mType, Arrays.hashCode(mCredential));
}
@Override

25
core/tests/coretests/src/android/provider/FontsContractTest.java
View File

@ -42,6 +42,7 @@ import androidx.test.filters.SmallTest;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
/**
@ -282,9 +283,10 @@ public class FontsContractTest extends ProviderTestCase2<TestFontsProvider> {
setupPackageManager();
byte[] wrongCert = Base64.decode("this is a wrong cert", Base64.DEFAULT);
List<byte[]> certList = Arrays.asList(wrongCert);
List<byte[]> certList = Collections.singletonList(wrongCert);
FontRequest requestWrongCerts = new FontRequest(
TestFontsProvider.AUTHORITY, PACKAGE_NAME, "query", Arrays.asList(certList));
TestFontsProvider.AUTHORITY, PACKAGE_NAME, "query",
Collections.singletonList(certList));
assertNull(FontsContract.getProvider(mPackageManager, requestWrongCerts));
}
@ -293,9 +295,10 @@ public class FontsContractTest extends ProviderTestCase2<TestFontsProvider> {
throws PackageManager.NameNotFoundException {
ProviderInfo info = setupPackageManager();
List<byte[]> certList = Arrays.asList(BYTE_ARRAY);
List<byte[]> certList = Collections.singletonList(BYTE_ARRAY);
FontRequest requestRightCerts = new FontRequest(
TestFontsProvider.AUTHORITY, PACKAGE_NAME, "query", Arrays.asList(certList));
TestFontsProvider.AUTHORITY, PACKAGE_NAME, "query",
Collections.singletonList(certList));
ProviderInfo result = FontsContract.getProvider(
mPackageManager, requestRightCerts);
@ -309,7 +312,8 @@ public class FontsContractTest extends ProviderTestCase2<TestFontsProvider> {
byte[] wrongCert = Base64.decode("this is a wrong cert", Base64.DEFAULT);
List<byte[]> certList = Arrays.asList(wrongCert, BYTE_ARRAY);
FontRequest requestRightCerts = new FontRequest(
TestFontsProvider.AUTHORITY, PACKAGE_NAME, "query", Arrays.asList(certList));
TestFontsProvider.AUTHORITY, PACKAGE_NAME, "query",
Collections.singletonList(certList));
assertNull(FontsContract.getProvider(mPackageManager, requestRightCerts));
}
@ -332,7 +336,8 @@ public class FontsContractTest extends ProviderTestCase2<TestFontsProvider> {
// {BYTE_ARRAY_2, BYTE_ARRAY_COPY}.
List<byte[]> certList = Arrays.asList(BYTE_ARRAY_2, BYTE_ARRAY_COPY);
FontRequest requestRightCerts = new FontRequest(
TestFontsProvider.AUTHORITY, PACKAGE_NAME, "query", Arrays.asList(certList));
TestFontsProvider.AUTHORITY, PACKAGE_NAME, "query",
Collections.singletonList(certList));
assertNull(FontsContract.getProvider(mPackageManager, requestRightCerts));
}
@ -341,9 +346,9 @@ public class FontsContractTest extends ProviderTestCase2<TestFontsProvider> {
ProviderInfo info = setupPackageManager();
List<List<byte[]>> certList = new ArrayList<>();
byte[] wrongCert = Base64.decode("this is a wrong cert", Base64.DEFAULT);
certList.add(Arrays.asList(wrongCert));
certList.add(Arrays.asList(BYTE_ARRAY));
certList.add(Collections.singletonList(
Base64.decode("this is a wrong cert", Base64.DEFAULT)));
certList.add(Collections.singletonList(BYTE_ARRAY));
FontRequest requestRightCerts = new FontRequest(
TestFontsProvider.AUTHORITY, PACKAGE_NAME, "query", certList);
ProviderInfo result = FontsContract.getProvider(mPackageManager, requestRightCerts);
@ -356,7 +361,7 @@ public class FontsContractTest extends ProviderTestCase2<TestFontsProvider> {
setupPackageManager();
List<List<byte[]>> certList = new ArrayList<>();
certList.add(Arrays.asList(BYTE_ARRAY));
certList.add(Collections.singletonList(BYTE_ARRAY));
FontRequest requestRightCerts = new FontRequest(
TestFontsProvider.AUTHORITY, "com.wrong.package.name", "query", certList);
try {

3
graphics/java/android/graphics/ColorSpace.java
View File

@ -2796,7 +2796,8 @@ public abstract class ColorSpace {
if (mWhitePoint == null || mTransform == null) {
throw new IllegalStateException(
"ColorSpace (" + this + ") cannot create native object! mWhitePoint: "
+ mWhitePoint + " mTransform: " + mTransform);
+ Arrays.toString(mWhitePoint) + " mTransform: "
+ Arrays.toString(mTransform));
}
// This mimics the old code that was in native.

32
media/java/android/media/MediaPlayer.java
View File

@ -5089,9 +5089,12 @@ public class MediaPlayer extends PlayerBase
@Nullable Map<String, String> optionalParameters)
throws NoDrmSchemeException
{
Log.v(TAG, "getKeyRequest: " +
" keySetId: " + keySetId + " initData:" + initData + " mimeType: " + mimeType +
" keyType: " + keyType + " optionalParameters: " + optionalParameters);
Log.v(TAG, "getKeyRequest: "
+ " keySetId: " + Arrays.toString(keySetId)
+ " initData:" + Arrays.toString(initData)
+ " mimeType: " + mimeType
+ " keyType: " + keyType
+ " optionalParameters: " + optionalParameters);
synchronized (mDrmLock) {
if (!mActiveDrmScheme) {
@ -5150,7 +5153,8 @@ public class MediaPlayer extends PlayerBase
public byte[] provideKeyResponse(@Nullable byte[] keySetId, @NonNull byte[] response)
throws NoDrmSchemeException, DeniedByServerException
{
Log.v(TAG, "provideKeyResponse: keySetId: " + keySetId + " response: " + response);
Log.v(TAG, "provideKeyResponse: keySetId: " + Arrays.toString(keySetId)
+ " response: " + Arrays.toString(response));
synchronized (mDrmLock) {
@ -5166,8 +5170,9 @@ public class MediaPlayer extends PlayerBase
byte[] keySetResult = mDrmObj.provideKeyResponse(scope, response);
Log.v(TAG, "provideKeyResponse: keySetId: " + keySetId + " response: " + response +
" --> " + keySetResult);
Log.v(TAG, "provideKeyResponse: keySetId: " + Arrays.toString(keySetId)
+ " response: " + Arrays.toString(response)
+ " --> " + Arrays.toString(keySetResult));
return keySetResult;
@ -5194,7 +5199,7 @@ public class MediaPlayer extends PlayerBase
public void restoreKeys(@NonNull byte[] keySetId)
throws NoDrmSchemeException
{
Log.v(TAG, "restoreKeys: keySetId: " + keySetId);
Log.v(TAG, "restoreKeys: keySetId: " + Arrays.toString(keySetId));
synchronized (mDrmLock) {
@ -5481,7 +5486,8 @@ public class MediaPlayer extends PlayerBase
// at prepareDrm/openSession rather than getKeyRequest/provideKeyResponse
try {
mDrmSessionId = mDrmObj.openSession();
Log.v(TAG, "prepareDrm_openSessionStep: mDrmSessionId=" + mDrmSessionId);
Log.v(TAG, "prepareDrm_openSessionStep: mDrmSessionId="
+ Arrays.toString(mDrmSessionId));
// Sending it down to native/mediaserver to create the crypto object
// This call could simply fail due to bad player state, e.g., after start().
@ -5544,7 +5550,7 @@ public class MediaPlayer extends PlayerBase
response = Streams.readFully(connection.getInputStream());
Log.v(TAG, "HandleProvisioninig: Thread run: response " +
response.length + " " + response);
response.length + " " + Arrays.toString(response));
} catch (Exception e) {
status = PREPARE_DRM_STATUS_PROVISIONING_NETWORK_ERROR;
Log.w(TAG, "HandleProvisioninig: Thread run: connect " + e + " url: " + url);
@ -5628,8 +5634,9 @@ public class MediaPlayer extends PlayerBase
return PREPARE_DRM_STATUS_PREPARATION_ERROR;
}
Log.v(TAG, "HandleProvisioninig provReq " +
" data: " + provReq.getData() + " url: " + provReq.getDefaultUrl());
Log.v(TAG, "HandleProvisioninig provReq "
+ " data: " + Arrays.toString(provReq.getData())
+ " url: " + provReq.getDefaultUrl());
// networking in a background thread
mDrmProvisioningInProgress = true;
@ -5712,7 +5719,8 @@ public class MediaPlayer extends PlayerBase
private void cleanDrmObj()
{
// the caller holds mDrmLock
Log.v(TAG, "cleanDrmObj: mDrmObj=" + mDrmObj + " mDrmSessionId=" + mDrmSessionId);
Log.v(TAG, "cleanDrmObj: mDrmObj=" + mDrmObj
+ " mDrmSessionId=" + Arrays.toString(mDrmSessionId));
if (mDrmSessionId != null) {
mDrmObj.closeSession(mDrmSessionId);

5
media/java/android/media/audiopolicy/AudioProductStrategy.java
View File

@ -32,6 +32,7 @@ import com.android.internal.annotations.GuardedBy;
import com.android.internal.util.Preconditions;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
@ -182,7 +183,7 @@ public final class AudioProductStrategy implements Parcelable {
AudioProductStrategy thatStrategy = (AudioProductStrategy) o;
return mName == thatStrategy.mName && mId == thatStrategy.mId
&& mAudioAttributesGroups.equals(thatStrategy.mAudioAttributesGroups);
&& Arrays.equals(mAudioAttributesGroups, thatStrategy.mAudioAttributesGroups);
}
/**
@ -415,7 +416,7 @@ public final class AudioProductStrategy implements Parcelable {
return mVolumeGroupId == thatAag.mVolumeGroupId
&& mLegacyStreamType == thatAag.mLegacyStreamType
&& mAudioAttributes.equals(thatAag.mAudioAttributes);
&& Arrays.equals(mAudioAttributes, thatAag.mAudioAttributes);
}
public int getStreamType() {

2
media/java/android/media/audiopolicy/AudioVolumeGroup.java
View File

@ -114,7 +114,7 @@ public final class AudioVolumeGroup implements Parcelable {
AudioVolumeGroup thatAvg = (AudioVolumeGroup) o;
return mName == thatAvg.mName && mId == thatAvg.mId
&& mAudioAttributes.equals(thatAvg.mAudioAttributes);
&& Arrays.equals(mAudioAttributes, thatAvg.mAudioAttributes);
}
/**

7
media/java/android/media/metrics/PlaybackMetrics.java
View File

@ -402,9 +402,10 @@ public final class PlaybackMetrics implements Parcelable {
@Override
public int hashCode() {
return Objects.hash(mMediaDurationMillis, mStreamSource, mStreamType, mPlaybackType,
mDrmType, mContentType, mPlayerName, mPlayerVersion, mExperimentIds,
mVideoFramesPlayed, mVideoFramesDropped, mAudioUnderrunCount, mNetworkBytesRead,
mLocalBytesRead, mNetworkTransferDurationMillis, mDrmSessionId);
mDrmType, mContentType, mPlayerName, mPlayerVersion,
Arrays.hashCode(mExperimentIds), mVideoFramesPlayed, mVideoFramesDropped,
mAudioUnderrunCount, mNetworkBytesRead, mLocalBytesRead,
mNetworkTransferDurationMillis, Arrays.hashCode(mDrmSessionId));
}
@Override

20
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraErrorCollector.java
View File

@ -16,10 +16,6 @@
package com.android.mediaframeworktest.helpers;
import org.hamcrest.CoreMatchers;
import org.hamcrest.Matcher;
import org.junit.rules.ErrorCollector;
import android.graphics.Rect;
import android.hardware.camera2.CameraCharacteristics;
import android.hardware.camera2.CaptureRequest;
@ -30,6 +26,10 @@ import android.media.Image;
import android.util.Log;
import android.util.Size;
import org.hamcrest.CoreMatchers;
import org.hamcrest.Matcher;
import org.junit.rules.ErrorCollector;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
@ -903,7 +903,7 @@ public class CameraErrorCollector extends ErrorCollector {
if ((value = expectKeyValueNotNull(characteristics, key)) == null) {
return;
}
String reason = "Key " + key.getName() + " value " + value
String reason = "Key " + key.getName() + " value " + Arrays.toString(value)
+ " doesn't contain the expected value " + expected;
expectContains(reason, value, expected);
}
@ -921,7 +921,7 @@ public class CameraErrorCollector extends ErrorCollector {
if ((value = expectKeyValueNotNull(characteristics, key)) == null) {
return;
}
String reason = "Key " + key.getName() + " value " + value
String reason = "Key " + key.getName() + " value " + Arrays.toString(value)
+ " doesn't contain the expected value " + expected;
expectContains(reason, value, expected);
}
@ -939,7 +939,7 @@ public class CameraErrorCollector extends ErrorCollector {
if ((value = expectKeyValueNotNull(characteristics, key)) == null) {
return;
}
String reason = "Key " + key.getName() + " value " + value
String reason = "Key " + key.getName() + " value " + Arrays.toString(value)
+ " doesn't contain the expected value " + expected;
expectContains(reason, value, expected);
}
@ -960,7 +960,7 @@ public class CameraErrorCollector extends ErrorCollector {
public <T> void expectContains(T[] values, T expected) {
String reason = "Expected value " + expected
+ " is not contained in the given values " + values;
+ " is not contained in the given values " + Arrays.toString(values);
expectContains(reason, values, expected);
}
@ -996,7 +996,7 @@ public class CameraErrorCollector extends ErrorCollector {
public void expectContains(int[] values, int expected) {
String reason = "Expected value " + expected
+ " is not contained in the given values " + values;
+ " is not contained in the given values " + Arrays.toString(values);
expectContains(reason, values, expected);
}
@ -1040,7 +1040,7 @@ public class CameraErrorCollector extends ErrorCollector {
*/
public void expectContains(boolean[] values, boolean expected) {
String reason = "Expected value " + expected
+ " is not contained in the given values " + values;
+ " is not contained in the given values " + Arrays.toString(values);
expectContains(reason, values, expected);
}

70
opengl/java/android/opengl/GLLogWrapper.java
View File

@ -2812,7 +2812,7 @@ class GLLogWrapper extends GLWrapperBase {
public void glDeleteBuffers(int n, int[] buffers, int offset) {
begin("glDeleteBuffers");
arg("n", n);
arg("buffers", buffers.toString());
arg("buffers", Arrays.toString(buffers));
arg("offset", offset);
end();
mgl11.glDeleteBuffers(n, buffers, offset);
@ -2831,7 +2831,7 @@ class GLLogWrapper extends GLWrapperBase {
public void glGenBuffers(int n, int[] buffers, int offset) {
begin("glGenBuffers");
arg("n", n);
arg("buffers", buffers.toString());
arg("buffers", Arrays.toString(buffers));
arg("offset", offset);
end();
mgl11.glGenBuffers(n, buffers, offset);
@ -2850,7 +2850,7 @@ class GLLogWrapper extends GLWrapperBase {
public void glGetBooleanv(int pname, boolean[] params, int offset) {
begin("glGetBooleanv");
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
arg("offset", offset);
end();
mgl11.glGetBooleanv(pname, params, offset);
@ -2871,7 +2871,7 @@ class GLLogWrapper extends GLWrapperBase {
begin("glGetBufferParameteriv");
arg("target", target);
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
arg("offset", offset);
end();
mgl11.glGetBufferParameteriv(target, pname, params, offset);
@ -2891,7 +2891,7 @@ class GLLogWrapper extends GLWrapperBase {
public void glGetClipPlanef(int pname, float[] eqn, int offset) {
begin("glGetClipPlanef");
arg("pname", pname);
arg("eqn", eqn.toString());
arg("eqn", Arrays.toString(eqn));
arg("offset", offset);
end();
mgl11.glGetClipPlanef(pname, eqn, offset);
@ -2910,7 +2910,7 @@ class GLLogWrapper extends GLWrapperBase {
public void glGetClipPlanex(int pname, int[] eqn, int offset) {
begin("glGetClipPlanex");
arg("pname", pname);
arg("eqn", eqn.toString());
arg("eqn", Arrays.toString(eqn));
arg("offset", offset);
end();
mgl11.glGetClipPlanex(pname, eqn, offset);
@ -2928,7 +2928,7 @@ class GLLogWrapper extends GLWrapperBase {
public void glGetFixedv(int pname, int[] params, int offset) {
begin("glGetFixedv");
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
arg("offset", offset);
end();
mgl11.glGetFixedv(pname, params, offset);
@ -2946,7 +2946,7 @@ class GLLogWrapper extends GLWrapperBase {
public void glGetFloatv(int pname, float[] params, int offset) {
begin("glGetFloatv");
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
arg("offset", offset);
end();
mgl11.glGetFloatv(pname, params, offset);
@ -2965,7 +2965,7 @@ class GLLogWrapper extends GLWrapperBase {
begin("glGetLightfv");
arg("light", light);
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
arg("offset", offset);
end();
mgl11.glGetLightfv(light, pname, params, offset);
@ -2986,7 +2986,7 @@ class GLLogWrapper extends GLWrapperBase {
begin("glGetLightxv");
arg("light", light);
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
arg("offset", offset);
end();
mgl11.glGetLightxv(light, pname, params, offset);
@ -3008,7 +3008,7 @@ class GLLogWrapper extends GLWrapperBase {
begin("glGetMaterialfv");
arg("face", face);
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
arg("offset", offset);
end();
mgl11.glGetMaterialfv(face, pname, params, offset);
@ -3029,7 +3029,7 @@ class GLLogWrapper extends GLWrapperBase {
begin("glGetMaterialxv");
arg("face", face);
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
arg("offset", offset);
end();
mgl11.glGetMaterialxv(face, pname, params, offset);
@ -3050,7 +3050,7 @@ class GLLogWrapper extends GLWrapperBase {
begin("glGetTexEnviv");
arg("env", env);
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
arg("offset", offset);
end();
mgl11.glGetTexEnviv(env, pname, params, offset);
@ -3071,7 +3071,7 @@ class GLLogWrapper extends GLWrapperBase {
begin("glGetTexEnviv");
arg("env", env);
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
arg("offset", offset);
end();
mgl11.glGetTexEnviv(env, pname, params, offset);
@ -3092,7 +3092,7 @@ class GLLogWrapper extends GLWrapperBase {
begin("glGetTexParameterfv");
arg("target", target);
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
arg("offset", offset);
end();
mgl11.glGetTexParameterfv(target, pname, params, offset);
@ -3113,7 +3113,7 @@ class GLLogWrapper extends GLWrapperBase {
begin("glGetTexParameteriv");
arg("target", target);
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
arg("offset", offset);
end();
mgl11.glGetTexEnviv(target, pname, params, offset);
@ -3135,7 +3135,7 @@ class GLLogWrapper extends GLWrapperBase {
begin("glGetTexParameterxv");
arg("target", target);
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
arg("offset", offset);
end();
mgl11.glGetTexParameterxv(target, pname, params, offset);
@ -3191,7 +3191,7 @@ class GLLogWrapper extends GLWrapperBase {
public void glPointParameterfv(int pname, float[] params, int offset) {
begin("glPointParameterfv");
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
arg("offset", offset);
end();
mgl11.glPointParameterfv(pname, params, offset);
@ -3219,7 +3219,7 @@ class GLLogWrapper extends GLWrapperBase {
public void glPointParameterxv(int pname, int[] params, int offset) {
begin("glPointParameterxv");
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
arg("offset", offset);
end();
mgl11.glPointParameterxv(pname, params, offset);
@ -3259,7 +3259,7 @@ class GLLogWrapper extends GLWrapperBase {
begin("glTexEnviv");
arg("target", target);
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
arg("offset", offset);
end();
mgl11.glTexEnviv(target, pname, params, offset);
@ -3281,7 +3281,7 @@ class GLLogWrapper extends GLWrapperBase {
begin("glTexParameterfv");
arg("target", target);
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
arg("offset", offset);
end();
mgl11.glTexParameterfv( target, pname, params, offset);
@ -3313,7 +3313,7 @@ class GLLogWrapper extends GLWrapperBase {
begin("glTexParameterxv");
arg("target", target);
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
arg("offset", offset);
end();
mgl11.glTexParameterxv(target, pname, params, offset);
@ -3356,7 +3356,7 @@ class GLLogWrapper extends GLWrapperBase {
public void glGetPointerv(int pname, Buffer[] params) {
begin("glGetPointerv");
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
end();
mgl11.glGetPointerv(pname, params);
checkError();
@ -3513,7 +3513,7 @@ class GLLogWrapper extends GLWrapperBase {
public void glDeleteFramebuffersOES(int n, int[] framebuffers, int offset) {
begin("glDeleteFramebuffersOES");
arg("n", n);
arg("framebuffers", framebuffers.toString());
arg("framebuffers", Arrays.toString(framebuffers));
arg("offset", offset);
end();
mgl11ExtensionPack.glDeleteFramebuffersOES(n, framebuffers, offset);
@ -3534,7 +3534,7 @@ class GLLogWrapper extends GLWrapperBase {
public void glDeleteRenderbuffersOES(int n, int[] renderbuffers, int offset) {
begin("glDeleteRenderbuffersOES");
arg("n", n);
arg("renderbuffers", renderbuffers.toString());
arg("renderbuffers", Arrays.toString(renderbuffers));
arg("offset", offset);
end();
mgl11ExtensionPack.glDeleteRenderbuffersOES(n, renderbuffers, offset);
@ -3591,7 +3591,7 @@ class GLLogWrapper extends GLWrapperBase {
public void glGenFramebuffersOES(int n, int[] framebuffers, int offset) {
begin("glGenFramebuffersOES");
arg("n", n);
arg("framebuffers", framebuffers.toString());
arg("framebuffers", Arrays.toString(framebuffers));
arg("offset", offset);
end();
mgl11ExtensionPack.glGenFramebuffersOES(n, framebuffers, offset);
@ -3612,7 +3612,7 @@ class GLLogWrapper extends GLWrapperBase {
public void glGenRenderbuffersOES(int n, int[] renderbuffers, int offset) {
begin("glGenRenderbuffersOES");
arg("n", n);
arg("renderbuffers", renderbuffers.toString());
arg("renderbuffers", Arrays.toString(renderbuffers));
arg("offset", offset);
end();
mgl11ExtensionPack.glGenRenderbuffersOES(n, renderbuffers, offset);
@ -3636,7 +3636,7 @@ class GLLogWrapper extends GLWrapperBase {
arg("target", target);
arg("attachment", attachment);
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
arg("offset", offset);
end();
mgl11ExtensionPack.glGetFramebufferAttachmentParameterivOES(target, attachment, pname, params, offset);
@ -3662,7 +3662,7 @@ class GLLogWrapper extends GLWrapperBase {
begin("glGetRenderbufferParameterivOES");
arg("target", target);
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
arg("offset", offset);
end();
mgl11ExtensionPack.glGetRenderbufferParameterivOES(target, pname, params, offset);
@ -3686,7 +3686,7 @@ class GLLogWrapper extends GLWrapperBase {
begin("glGetTexGenfv");
arg("coord", coord);
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
arg("offset", offset);
end();
mgl11ExtensionPack.glGetTexGenfv(coord, pname, params, offset);
@ -3709,7 +3709,7 @@ class GLLogWrapper extends GLWrapperBase {
begin("glGetTexGeniv");
arg("coord", coord);
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
arg("offset", offset);
end();
mgl11ExtensionPack.glGetTexGeniv(coord, pname, params, offset);
@ -3732,7 +3732,7 @@ class GLLogWrapper extends GLWrapperBase {
begin("glGetTexGenxv");
arg("coord", coord);
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
arg("offset", offset);
end();
mgl11ExtensionPack.glGetTexGenxv(coord, pname, params, offset);
@ -3799,7 +3799,7 @@ class GLLogWrapper extends GLWrapperBase {
begin("glTexGenfv");
arg("coord", coord);
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
arg("offset", offset);
end();
mgl11ExtensionPack.glTexGenfv(coord, pname, params, offset);
@ -3833,7 +3833,7 @@ class GLLogWrapper extends GLWrapperBase {
begin("glTexGeniv");
arg("coord", coord);
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
arg("offset", offset);
end();
mgl11ExtensionPack.glTexGeniv(coord, pname, params, offset);
@ -3867,7 +3867,7 @@ class GLLogWrapper extends GLWrapperBase {
begin("glTexGenxv");
arg("coord", coord);
arg("pname", pname);
arg("params", params.toString());
arg("params", Arrays.toString(params));
arg("offset", offset);
end();
mgl11ExtensionPack.glTexGenxv(coord, pname, params, offset);

4
services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@ -685,8 +685,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
if (mTraceManager.isA11yTracingEnabledForTypes(FLAGS_PACKAGE_BROADCAST_RECEIVER)) {
mTraceManager.logTrace(LOG_TAG + ".PM.onHandleForceStop",
FLAGS_PACKAGE_BROADCAST_RECEIVER,
"intent=" + intent + ";packages=" + packages + ";uid=" + uid
+ ";doit=" + doit);
"intent=" + intent + ";packages=" + Arrays.toString(packages)
+ ";uid=" + uid + ";doit=" + doit);
}
synchronized (mLock) {
final int userId = getChangingUserId();

2
services/accessibility/java/com/android/server/accessibility/gestures/MultiFingerSwipe.java
View File

@ -447,7 +447,7 @@ class MultiFingerSwipe extends GestureMatcher {
StringBuilder builder = new StringBuilder(super.toString());
if (getState() != STATE_GESTURE_CANCELED) {
builder.append(", mBase: ")
.append(mBase.toString())
.append(Arrays.toString(mBase))
.append(", mMinPixelsBetweenSamplesX:")
.append(mMinPixelsBetweenSamplesX)
.append(", mMinPixelsBetweenSamplesY:")

3
services/backup/java/com/android/server/backup/UserBackupManagerService.java
View File

@ -85,7 +85,6 @@ import android.os.PowerSaveState;
import android.os.Process;
import android.os.RemoteException;
import android.os.SELinux;
import android.os.ServiceManager;
import android.os.SystemClock;
import android.os.UserHandle;
import android.os.WorkSource;
@ -2832,7 +2831,7 @@ public class UserBackupManagerService {
+ " includekeyvalue="
+ doKeyValue
+ " pkgs="
+ pkgList));
+ Arrays.toString(pkgList)));
}
Slog.i(TAG, addUserIdToLogMessage(mUserId, "Beginning adb backup..."));

7
services/backup/java/com/android/server/backup/utils/BackupEligibilityRules.java
View File

@ -25,9 +25,9 @@ import static com.android.server.pm.PackageManagerService.PLATFORM_PACKAGE_NAME;
import android.annotation.Nullable;
import android.app.backup.BackupManager.OperationType;
import android.app.backup.BackupTransport;
import android.app.compat.CompatChanges;
import android.compat.annotation.ChangeId;
import android.compat.annotation.EnabledSince;
import android.app.compat.CompatChanges;
import android.compat.annotation.Overridable;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
@ -46,6 +46,7 @@ import com.android.server.backup.transport.TransportConnection;
import com.google.android.collect.Sets;
import java.util.Arrays;
import java.util.Set;
/**
@ -359,8 +360,8 @@ public class BackupEligibilityRules {
}
if (DEBUG) {
Slog.v(TAG, "signaturesMatch(): stored=" + storedSigs + " device="
+ signingInfo.getApkContentsSigners());
Slog.v(TAG, "signaturesMatch(): stored=" + Arrays.toString(storedSigs)
+ " device=" + Arrays.toString(signingInfo.getApkContentsSigners()));
}
final int nStored = storedSigs.length;

3
services/core/java/com/android/server/appop/DiscreteRegistry.java
View File

@ -816,8 +816,7 @@ final class DiscreteRegistry {
}
} catch (Throwable t) {
Slog.e(TAG, "Error while cleaning timeline files: " + t.getMessage() + " "
+ t.getStackTrace());
Slog.e(TAG, "Error while cleaning timeline files: ", t);
}
}
}

6
services/core/java/com/android/server/backup/BackupUtils.java
View File

@ -30,6 +30,7 @@ import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
public class BackupUtils {
private static final String TAG = "BackupUtils";
@ -64,8 +65,9 @@ public class BackupUtils {
}
if (DEBUG) {
Slog.v(TAG, "signaturesMatch(): stored=" + storedSigHashes
+ " device=" + signingInfo.getApkContentsSigners());
Slog.v(TAG, "signaturesMatch(): stored="
+ storedSigHashes.stream().map(Arrays::toString).collect(Collectors.toList())
+ " device=" + Arrays.toString(signingInfo.getApkContentsSigners()));
}
final int nStored = storedSigHashes.size();

2
services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java
View File

@ -554,7 +554,7 @@ class GnssNetworkConnectivityHandler {
mAGpsDataConnectionIpAddr = InetAddress.getByAddress(suplIpAddr);
if (DEBUG) Log.d(TAG, "IP address converted to: " + mAGpsDataConnectionIpAddr);
} catch (UnknownHostException e) {
Log.e(TAG, "Bad IP Address: " + suplIpAddr, e);
Log.e(TAG, "Bad IP Address: " + Arrays.toString(suplIpAddr), e);
}
}

5
services/core/java/com/android/server/net/watchlist/WatchlistLoggingHandler.java
View File

@ -36,7 +36,6 @@ import android.provider.Settings;
import android.text.TextUtils;
import android.util.Slog;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.ArrayUtils;
import com.android.internal.util.HexDump;
@ -45,8 +44,8 @@ import java.io.File;
import java.io.IOException;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
@ -155,7 +154,7 @@ class WatchlistLoggingHandler extends Handler {
try {
final String[] packageNames = mPm.getPackagesForUid(uid);
if (packageNames == null || packageNames.length == 0) {
Slog.e(TAG, "Couldn't find package: " + packageNames);
Slog.e(TAG, "Couldn't find package: " + Arrays.toString(packageNames));
return false;
}
ai = mPm.getApplicationInfo(packageNames[0], 0);

2
services/core/java/com/android/server/wm/AccessibilityController.java
View File

@ -420,7 +420,7 @@ final class AccessibilityController {
if (mAccessibilityTracing.isTracingEnabled(FLAGS_WINDOWS_FOR_ACCESSIBILITY_CALLBACK)) {
mAccessibilityTracing.logTrace(TAG + ".onSomeWindowResizedOrMoved",
FLAGS_WINDOWS_FOR_ACCESSIBILITY_CALLBACK,
"displayIds={" + displayIds.toString() + "}", "".getBytes(), callingUid);
"displayIds={" + Arrays.toString(displayIds) + "}", "".getBytes(), callingUid);
}
// Not relevant for the display magnifier.
for (int i = 0; i < displayIds.length; i++) {

3
services/core/java/com/android/server/wm/TaskPersister.java
View File

@ -53,6 +53,7 @@ import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@ -424,7 +425,7 @@ public class TaskPersister implements PersisterQueue.Listener {
private static void removeObsoleteFiles(ArraySet<Integer> persistentTaskIds, File[] files) {
if (DEBUG) Slog.d(TAG, "removeObsoleteFiles: persistentTaskIds=" + persistentTaskIds +
" files=" + files);
" files=" + Arrays.toString(files));
if (files == null) {
Slog.e(TAG, "File error accessing recents directory (directory doesn't exist?).");
return;

2
services/tests/servicestests/src/com/android/server/accessibility/MotionEventInjectorTest.java
View File

@ -837,7 +837,7 @@ public class MotionEventInjectorTest {
@Override
public void describeTo(Description description) {
description.appendText("Contains points " + points);
description.appendText("Contains points " + Arrays.toString(points));
}
};
}

4
services/usage/java/com/android/server/usage/AppTimeLimitController.java
View File

@ -772,7 +772,7 @@ public class AppTimeLimitController {
observerApp.appUsageGroups.append(observerId, group);
if (DEBUG) {
Slog.d(TAG, "addObserver " + observed + " for " + timeLimit);
Slog.d(TAG, "addObserver " + Arrays.toString(observed) + " for " + timeLimit);
}
user.addUsageGroup(group);
@ -881,7 +881,7 @@ public class AppTimeLimitController {
observerApp.appUsageLimitGroups.append(observerId, group);
if (DEBUG) {
Slog.d(TAG, "addObserver " + observed + " for " + timeLimit);
Slog.d(TAG, "addObserver " + Arrays.toString(observed) + " for " + timeLimit);
}
user.addUsageGroup(group);

2
telephony/common/com/google/android/mms/pdu/PduParser.java
View File

@ -793,7 +793,7 @@ public class PduParser {
try {
if (LOCAL_LOGV) {
Log.v(LOG_TAG, "parseHeaders: CONTENT_TYPE: " + headerField +
contentType.toString());
Arrays.toString(contentType));
}
headers.setTextString(contentType, PduHeaders.CONTENT_TYPE);
} catch(NullPointerException e) {

3
telephony/java/android/telephony/PhysicalChannelConfig.java
View File

@ -433,7 +433,8 @@ public final class PhysicalChannelConfig implements Parcelable {
return Objects.hash(
mCellConnectionStatus, mCellBandwidthDownlinkKhz, mCellBandwidthUplinkKhz,
mNetworkType, mFrequencyRange, mDownlinkChannelNumber, mUplinkChannelNumber,
mContextIds, mPhysicalCellId, mBand, mDownlinkFrequency, mUplinkFrequency);
Arrays.hashCode(mContextIds), mPhysicalCellId, mBand, mDownlinkFrequency,
mUplinkFrequency);
}
public static final

4
telephony/java/android/telephony/SignalThresholdInfo.java
View File

@ -574,8 +574,8 @@ public final class SignalThresholdInfo implements Parcelable {
@Override
public int hashCode() {
return Objects.hash(mRan, mSignalMeasurementType, mHysteresisMs, mHysteresisDb, mThresholds,
mIsEnabled);
return Objects.hash(mRan, mSignalMeasurementType, mHysteresisMs, mHysteresisDb,
Arrays.hashCode(mThresholds), mIsEnabled);
}
public static final @NonNull Parcelable.Creator<SignalThresholdInfo> CREATOR =

4
telephony/java/android/telephony/SmsManager.java
View File

@ -1935,7 +1935,7 @@ public final class SmsManager {
+ " at calling enableCellBroadcastRangeForSubscriber. subId = " + subId);
}
} catch (RemoteException ex) {
Rlog.d(TAG, "enableCellBroadcastRange: " + ex.getStackTrace());
Rlog.d(TAG, "enableCellBroadcastRange: ", ex);
// ignore it
}
@ -1996,7 +1996,7 @@ public final class SmsManager {
+ " at calling disableCellBroadcastRangeForSubscriber. subId = " + subId);
}
} catch (RemoteException ex) {
Rlog.d(TAG, "disableCellBroadcastRange: " + ex.getStackTrace());
Rlog.d(TAG, "disableCellBroadcastRange: ", ex);
// ignore it
}

6
telephony/java/android/telephony/SubscriptionInfo.java
View File

@ -967,9 +967,9 @@ public class SubscriptionInfo implements Parcelable {
public int hashCode() {
return Objects.hash(mId, mSimSlotIndex, mNameSource, mIconTint, mDataRoaming, mIsEmbedded,
mIsOpportunistic, mGroupUUID, mIccId, mNumber, mMcc, mMnc, mCountryIso, mCardString,
mCardId, mDisplayName, mCarrierName, mNativeAccessRules, mIsGroupDisabled,
mCarrierId, mProfileClass, mGroupOwner, mAreUiccApplicationsEnabled, mPortIndex,
mUsageSetting);
mCardId, mDisplayName, mCarrierName, Arrays.hashCode(mNativeAccessRules),
mIsGroupDisabled, mCarrierId, mProfileClass, mGroupOwner,
mAreUiccApplicationsEnabled, mPortIndex, mUsageSetting);
}
@Override

2
telephony/java/android/telephony/TelephonyScanManager.java
View File

@ -171,7 +171,7 @@ public final class TelephonyScanManager {
ci[i] = (CellInfo) parcelables[i];
}
executor.execute(() -> {
Rlog.d(TAG, "onResults: " + ci.toString());
Rlog.d(TAG, "onResults: " + Arrays.toString(ci));
callback.onResults(Arrays.asList(ci));
});
} catch (Exception e) {

4
tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionSession.java
View File

@ -33,6 +33,8 @@ import android.widget.CheckBox;
import android.widget.ImageView;
import android.widget.TextView;
import java.util.Arrays;
public class MainInteractionSession extends VoiceInteractionSession
implements View.OnClickListener {
static final String TAG = "MainInteractionSession";
@ -403,7 +405,7 @@ public class MainInteractionSession extends VoiceInteractionSession
@Override
public void onRequestPickOption(PickOptionRequest request) {
Log.i(TAG, "onPickOption: prompt=" + request.getVoicePrompt() + " options="
+ request.getOptions() + " extras=" + request.getExtras());
+ Arrays.toString(request.getOptions()) + " extras=" + request.getExtras());
mConfirmButton.setText("Pick Option");
mPendingRequest = request;
setPrompt(request.getVoicePrompt());

5
tests/VoiceInteraction/src/com/android/test/voiceinteraction/StartVoiceInteractionActivity.java
View File

@ -24,6 +24,8 @@ import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import java.util.Arrays;
public class StartVoiceInteractionActivity extends Activity implements View.OnClickListener {
static final String TAG = "LocalVoiceInteractionActivity";
@ -187,7 +189,8 @@ public class StartVoiceInteractionActivity extends Activity implements View.OnCl
}
@Override
public void onPickOptionResult(boolean finished, Option[] selections, Bundle result) {
Log.i(TAG, "Pick result: finished=" + finished + " selections=" + selections
Log.i(TAG, "Pick result: finished=" + finished
+ " selections=" + Arrays.toString(selections)
+ " result=" + result);
StringBuilder sb = new StringBuilder();
if (finished) {

5
tests/VoiceInteraction/src/com/android/test/voiceinteraction/TestInteractionActivity.java
View File

@ -28,6 +28,8 @@ import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import java.util.Arrays;
public class TestInteractionActivity extends Activity implements View.OnClickListener {
static final String TAG = "TestInteractionActivity";
@ -240,7 +242,8 @@ public class TestInteractionActivity extends Activity implements View.OnClickLis
}
@Override
public void onPickOptionResult(boolean finished, Option[] selections, Bundle result) {
Log.i(TAG, "Pick result: finished=" + finished + " selections=" + selections
Log.i(TAG, "Pick result: finished=" + finished
+ " selections=" + Arrays.toString(selections)
+ " result=" + result);
StringBuilder sb = new StringBuilder();
if (finished) {