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

Commit 5cd9c5e8 authored by William Escande's avatar William Escande
Browse files

Errorprone enforce NullablePrimitive NullableVoid 

Bug: 344658662
Test: m com.android.btservice
Flag: Exempt refactor annotation only
Change-Id: I20d951cb49b289b6eb880cb8d175f62242b1306c
parent 5a8a8a3d

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -143,6 +143,8 @@ java_defaults { 
            "-Xep:NonAtomicVolatileUpdate:ERROR",

            "-Xep:NonCanonicalType:ERROR",

            "-Xep:NotJavadoc:ERROR",

            "-Xep:NullablePrimitive:ERROR",

            "-Xep:NullableVoid:ERROR",

            "-Xep:ObjectEqualsForPrimitives:ERROR",

            "-Xep:OperatorPrecedence:ERROR",

            "-Xep:ReferenceEquality:ERROR",

android/app/src/com/android/bluetooth/btservice/RemoteDevices.java

+0 −3
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ import android.os.ParcelUuid; 
import android.os.SystemProperties;

import android.util.Log;



import androidx.annotation.NonNull;



import com.android.bluetooth.BluetoothStatsLog;

import com.android.bluetooth.R;

import com.android.bluetooth.Utils;
@@ -1315,7 +1313,6 @@ public class RemoteDevices { 
        mAdapterService.aclStateChangeBroadcastCallback(connectionChangeConsumer);

    }



    @NonNull

    private void sendPairingCancelIntent(BluetoothDevice device) {

        Intent intent = new Intent(BluetoothDevice.ACTION_PAIRING_CANCEL);

        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);

framework/api/system-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -1166,8 +1166,8 @@ package android.bluetooth { 
    method @NonNull public byte[] getDeviceAddressWithType();

    method @Nullable public byte[] getDeviceName();

    method @Nullable public byte[] getLeAppearance();

    method @NonNull public int getLeDeviceRole();

    method @NonNull public int getLeFlags();

    method public int getLeDeviceRole();

    method public int getLeFlags();

    method @Nullable public byte[] getLeTemporaryKey();

    method @NonNull public byte[] getRandomizerHash();

    method public void writeToParcel(@NonNull android.os.Parcel, int);
@@ -1382,9 +1382,9 @@ package android.bluetooth.le { 


  public static interface DistanceMeasurementSession.Callback {

    method public void onResult(@NonNull android.bluetooth.BluetoothDevice, @NonNull android.bluetooth.le.DistanceMeasurementResult);

    method public void onStartFail(@NonNull int);

    method public void onStartFail(int);

    method public void onStarted(@NonNull android.bluetooth.le.DistanceMeasurementSession);

    method public void onStopped(@NonNull android.bluetooth.le.DistanceMeasurementSession, @NonNull int);

    method public void onStopped(@NonNull android.bluetooth.le.DistanceMeasurementSession, int);

  }



  @Deprecated public final class ResultStorageDescriptor implements android.os.Parcelable {

framework/java/android/bluetooth/OobData.java

+1 −3
Original line number Diff line number Diff line
@@ -750,7 +750,6 @@ public final class OobData implements Parcelable { 
     *     55 of LMP Feature Mask Definitions. <b>0x05- 0x07 Reserved</b>

     * @hide

     */

    @NonNull

    @SystemApi

    @LeFlag

    public int getLeFlags() {
@@ -766,7 +765,6 @@ public final class OobData implements Parcelable { 
     *     Preferred 0x04 - 0xFF Reserved

     * @hide

     */

    @NonNull

    @SystemApi

    public @LeRole int getLeDeviceRole() {

        return mLeDeviceRole;
@@ -849,7 +847,7 @@ public final class OobData implements Parcelable { 
    }



    // For Parcelable

    public static final @android.annotation.NonNull Parcelable.Creator<OobData> CREATOR =

    public static final @NonNull Parcelable.Creator<OobData> CREATOR =

            new Parcelable.Creator<OobData>() {

                public OobData createFromParcel(Parcel in) {

                    return new OobData(in);

framework/java/android/bluetooth/le/DistanceMeasurementSession.java

+2 −2
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ public final class DistanceMeasurementSession { 
         * @hide

         */

        @SystemApi

        void onStartFail(@NonNull @Reason int reason);

        void onStartFail(@Reason int reason);



        /**

         * Invoked when a distance measurement session stopped.
@@ -186,7 +186,7 @@ public final class DistanceMeasurementSession { 
         * @hide

         */

        @SystemApi

        void onStopped(@NonNull DistanceMeasurementSession session, @NonNull @Reason int reason);

        void onStopped(@NonNull DistanceMeasurementSession session, @Reason int reason);



        /**

         * Invoked when get distance measurement result.