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

Commit b29ace04 authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge changes I319ac82d,I6cc9d6d9,I6be5e43e,I4d7f779b,I83a8cb5b, ... into main 

* changes:
  ErrorProne: Enforce & fix EmptyBlockTag
  ErrorProne: Enforce & fix NonCanonicalType
  ErrorProne: Enforce & fix InvalidParam
  ErrorProne: Enforce & fix ReturnAtTheEndOfVoidFunction
  ErrorProne: Enforce & fix MockNotUsedInProduction
  ErrorProne: Enforce & fix FutureReturnValueIgnored
  ErrorProne: Enforce & fix InlineMeInliner
  ErrorProne: Enforce & fix InvalidBlockTag
  ErrorProne: Enforce & fix BadImport
  ErrorProne: Enforce & fix ClassCanBeStatic
  ErrorProne: Enforce & fix StringCharset
parents be9b9f12 befbb8df

android/app/Android.bp

+9 −0
Original line number Diff line number Diff line
@@ -321,6 +321,15 @@ android_app { 
        javacflags: [

            // "-Xep:AndroidFrameworkRequiresPermission:ERROR",

            "-Xep:AlmostJavadoc:ERROR",

            "-Xep:BadImport:ERROR",

            "-Xep:ClassCanBeStatic:ERROR",

            "-Xep:EmptyBlockTag:ERROR",

            "-Xep:InlineMeInliner:ERROR",

            "-Xep:InvalidBlockTag:ERROR",

            "-Xep:InvalidParam:ERROR",

            "-Xep:MockNotUsedInProduction:ERROR",

            "-Xep:NonCanonicalType:ERROR",

            "-Xep:ReturnAtTheEndOfVoidFunction:ERROR",

            "-Xep:UnusedMethod:ERROR",

            "-Xep:UnusedVariable:ERROR",

            "-XepExcludedPaths:.*/srcjars/.*", // Exclude generated files

android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkNativeInterface.java

+2 −11
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ public class A2dpSinkNativeInterface { 
     *

     * <p>Sending null for the active device will make no device active.

     *

     * @param device

     * @return True if the active device request has been scheduled

     */

    public boolean setActiveDevice(BluetoothDevice device) {
@@ -130,20 +129,12 @@ public class A2dpSinkNativeInterface { 
        return setActiveDeviceNative(address);

    }



    /**

     * Inform A2DP decoder of the current audio focus

     *

     * @param focusGranted

     */

    /** Inform A2DP decoder of the current audio focus */

    public void informAudioFocusState(int focusGranted) {

        informAudioFocusStateNative(focusGranted);

    }



    /**

     * Inform A2DP decoder the desired audio gain

     *

     * @param gain

     */

    /** Inform A2DP decoder the desired audio gain */

    public void informAudioTrackGain(float gain) {

        informAudioTrackGainNative(gain);

    }

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

+0 −1
Original line number Diff line number Diff line
@@ -568,7 +568,6 @@ public class MediaPlayerList { 
            playerList.add(new ListItem(playerFolder));

        }

        cb.run("", playerList);

        return;

    }



    /**

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

+2 −6
Original line number Diff line number Diff line
@@ -246,13 +246,9 @@ public class MediaPlayerWrapper { 
        return false;

    }



    void toggleShuffle(boolean on) {

        return;

    }

    void toggleShuffle(boolean on) {}



    void toggleRepeat(boolean on) {

        return;

    }

    void toggleRepeat(boolean on) {}



    /** Return whether the queue, metadata, and queueID are all in sync. */

    boolean isMetadataSynced() {

android/app/src/com/android/bluetooth/avrcp/AvrcpCoverArtService.java

+0 −2
Original line number Diff line number Diff line
@@ -159,14 +159,12 @@ public class AvrcpCoverArtService { 
    private void registerBipServer(int psm) {

        debug("Add our PSM (" + psm + ") to the AVRCP Target SDP record");

        mNativeInterface.registerBipServer(psm);

        return;

    }



    /** Remove any BIP L2CAP PSM from the AVRCP Target SDP Record */

    private void unregisterBipServer() {

        debug("Remove the PSM remove the AVRCP Target SDP record");

        mNativeInterface.unregisterBipServer();

        return;

    }



    /**