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

Commit 584140c8 authored by Cole Faust's avatar Cole Faust
Browse files

Fix array-related errorprone warnings 

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
parent b09fa7a1

Android.bp

+9 −0
Original line number Diff line number Diff line
@@ -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

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

+1 −1
Original line number Diff line number Diff line
@@ -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));

core/java/android/app/VoiceInteractor.java

+5 −1
Original line number Diff line number Diff line
@@ -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);

core/java/android/app/admin/PreferentialNetworkServiceConfig.java

+4 −7
Original line number Diff line number Diff line
@@ -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);

    }



    /**

core/java/android/companion/BluetoothLeDeviceFilter.java

+4 −3
Original line number Diff line number Diff line
@@ -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