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

Commit 85259a99 authored by Cole Faust's avatar Cole Faust
Browse files

Fixes for errorprone update 

When updating errorprone from 2.23.0 -> 2.32.0, more issues are found.

Bug: 253827323
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: Iac9b4741bfc289abdcf0da67eee4104552032930
parent 28e5177e

android/app/src/com/android/bluetooth/audio_util/MediaBrowserWrapper.java

+2 −3
Original line number Diff line number Diff line
@@ -189,8 +189,7 @@ class MediaBrowserWrapper { 
                                    + mediaId

                                    + ": adding callback and subscribing.");

                    mSubscribedIds.put(mediaId, new ArrayList<>(Arrays.asList(callback)));

                    mWrappedBrowser.subscribe(

                            mediaId, new BrowserSubscriptionCallback(mLooper, mediaId));

                    mWrappedBrowser.subscribe(mediaId, new BrowserSubscriptionCallback(mediaId));

                });

    }
@@ -319,7 +318,7 @@ class MediaBrowserWrapper { 
        private final Runnable mTimeoutRunnable;

        private boolean mCallbacksExecuted = false;



        public BrowserSubscriptionCallback(Looper looper, String mediaId) {

        BrowserSubscriptionCallback(String mediaId) {

            mTimeoutRunnable =

                    () -> {

                        executeCallbacks(mediaId, new ArrayList<>());

android/app/src/com/android/bluetooth/opp/BluetoothOppService.java

+2 −2
Original line number Diff line number Diff line
@@ -244,12 +244,12 @@ public class BluetoothOppService extends ProfileService implements IObexConnecti 


    @Override

    protected IProfileServiceBinder initBinder() {

        return new OppBinder(this);

        return new OppBinder();

    }



    private static class OppBinder extends Binder implements IProfileServiceBinder {



        OppBinder(BluetoothOppService service) {}

        OppBinder() {}



        @Override

        public void cleanup() {}

framework/java/android/bluetooth/le/ScanFilter.java

+2 −4
Original line number Diff line number Diff line
@@ -303,11 +303,9 @@ public final class ScanFilter implements Parcelable { 
                    // Advertising data type

                    int advertisingDataType = in.readInt();

                    if (in.readInt() == 1) {

                        byte[] advertisingData = null;

                        byte[] advertisingDataMask = null;



                        int advertisingDataLength = in.readInt();

                        advertisingData = new byte[advertisingDataLength];

                        byte[] advertisingData = new byte[advertisingDataLength];

                        byte[] advertisingDataMask = null;

                        in.readByteArray(advertisingData);

                        if (in.readInt() == 1) {

                            int advertisingDataMaskLength = in.readInt();