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

Commit 182a37b9 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "BluetoothApp: Enforce more error prone 2" into main am: 8317ce0c am: 2c1bcd41 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3202405



Change-Id: I79daf6405332ef1b68f25b63452d8dadf7ff7ab9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3fec2765 2c1bcd41

android/app/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ android_app { 
        enabled: true,

        javacflags: [

            "-Xep:AlmostJavadoc:ERROR",

            "-Xep:AlreadyChecked:ERROR",

            "-Xep:AndroidFrameworkBinderIdentity:ERROR",

            "-Xep:AndroidFrameworkEfficientStrings:ERROR",

            "-Xep:AndroidFrameworkRequiresPermission:ERROR",
@@ -331,20 +332,27 @@ android_app { 
            "-Xep:ClassCanBeStatic:ERROR",

            "-Xep:DateFormatConstant:ERROR",

            "-Xep:EmptyBlockTag:ERROR",

            "-Xep:FallThrough:ERROR",

            "-Xep:HidingField:ERROR",

            "-Xep:InlineMeInliner:ERROR",

            "-Xep:InvalidBlockTag:ERROR",

            "-Xep:InvalidParam:ERROR",

            "-Xep:LoopOverCharArray:ERROR",

            "-Xep:MissingCasesInEnumSwitch:ERROR",

            "-Xep:MockNotUsedInProduction:ERROR",

            "-Xep:ModifyCollectionInEnhancedForLoop:ERROR",

            "-Xep:NarrowCalculation:ERROR",

            "-Xep:NonApiType:ERROR",

            "-Xep:NonAtomicVolatileUpdate:ERROR",

            "-Xep:NonCanonicalType:ERROR",

            "-Xep:NotJavadoc:ERROR",

            "-Xep:OperatorPrecedence:ERROR",

            "-Xep:ReturnAtTheEndOfVoidFunction:ERROR",

            "-Xep:StringCaseLocaleUsage:ERROR",

            "-Xep:StringCharset:ERROR",

            "-Xep:ToStringReturnsNull:ERROR",

            "-Xep:UnnecessaryStringBuilder:ERROR",

            "-Xep:UnrecognisedJavadocTag:ERROR",

            "-Xep:UnusedMethod:ERROR",

            "-Xep:UnusedNestedClass:ERROR",

            "-Xep:UnusedVariable:ERROR",

android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpCoverArtManager.java

+2 −1
Original line number Diff line number Diff line
@@ -128,7 +128,8 @@ public class AvrcpCoverArtManager { 
     */

    public static boolean isValidImageHandle(String handle) {

        if (handle == null || handle.length() != 7) return false;

        for (char c : handle.toCharArray()) {

        for (int i = 0; i < handle.length(); i++) {

            char c = handle.charAt(i);

            if (!Character.isDigit(c)) {

                return false;

            }

android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipDateTime.java

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.bluetooth.avrcpcontroller;



import android.annotation.SuppressLint;



import com.android.bluetooth.Utils;



import java.util.Calendar;
@@ -121,6 +123,7 @@ public class BipDateTime { 
    }



    @Override

    @SuppressLint("ToStringReturnsNull")

    public String toString() {

        Date d = getTime();

        if (d == null) {

android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipImageDescriptor.java

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.bluetooth.avrcpcontroller;



import android.annotation.SuppressLint;

import android.util.Log;

import android.util.Xml;
@@ -262,6 +263,7 @@ public class BipImageDescriptor { 
    }



    @Override

    @SuppressLint("ToStringReturnsNull") // Since this is used for encoding to xml

    public String toString() {

        if (mEncoding == null || mPixel == null) {

            error(

android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipImageFormat.java

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.bluetooth.avrcpcontroller;



import android.annotation.SuppressLint;

import android.util.Log;



import java.util.Objects;
@@ -179,6 +180,7 @@ public class BipImageFormat { 
    }



    @Override

    @SuppressLint("ToStringReturnsNull") // Since this is used for encoding to xml

    public String toString() {

        if (mEncoding == null

                || mEncoding.getType() == BipEncoding.UNKNOWN