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

Commit 57d03914 authored by Andreas Gampe's avatar Andreas Gampe
Browse files

Frameworks: Annotate trivial @GuardedBy in media 

Add @GuardedBy for simple functions that require a single lock
and are named XYZLocked.

Derived by errorprone.

Bug: 73000847
Test: m
Test: m javac-check-framework RUN_ERROR_PRONE=true
Change-Id: I17e265a771604a06792566c2dd1842f9fe6439e7
parent e62a57a2

media/java/android/media/AudioRecord.java

+2 −0
Original line number Diff line number Diff line
@@ -1416,6 +1416,7 @@ public class AudioRecord implements AudioRouting 
    /*

     * Call BEFORE adding a routing callback handler.

     */

    @GuardedBy("mRoutingChangeListeners")

    private void testEnableNativeRoutingCallbacksLocked() {

        if (mRoutingChangeListeners.size() == 0) {

            native_enableDeviceCallback();
@@ -1425,6 +1426,7 @@ public class AudioRecord implements AudioRouting 
    /*

     * Call AFTER removing a routing callback handler.

     */

    @GuardedBy("mRoutingChangeListeners")

    private void testDisableNativeRoutingCallbacksLocked() {

        if (mRoutingChangeListeners.size() == 0) {

            native_disableDeviceCallback();

media/java/android/media/AudioTrack.java

+2 −0
Original line number Diff line number Diff line
@@ -2821,6 +2821,7 @@ public class AudioTrack extends PlayerBase 
    /*

     * Call BEFORE adding a routing callback handler.

     */

    @GuardedBy("mRoutingChangeListeners")

    private void testEnableNativeRoutingCallbacksLocked() {

        if (mRoutingChangeListeners.size() == 0) {

            native_enableDeviceCallback();
@@ -2830,6 +2831,7 @@ public class AudioTrack extends PlayerBase 
    /*

     * Call AFTER removing a routing callback handler.

     */

    @GuardedBy("mRoutingChangeListeners")

    private void testDisableNativeRoutingCallbacksLocked() {

        if (mRoutingChangeListeners.size() == 0) {

            native_disableDeviceCallback();

media/java/android/media/MediaPlayer.java

+1 −0
Original line number Diff line number Diff line
@@ -1484,6 +1484,7 @@ public class MediaPlayer extends PlayerBase 
    /*

     * Call BEFORE adding a routing callback handler or AFTER removing a routing callback handler.

     */

    @GuardedBy("mRoutingChangeListeners")

    private void enableNativeRoutingCallbacksLocked(boolean enabled) {

        if (mRoutingChangeListeners.size() == 0) {

            native_enableDeviceCallback(enabled);

media/java/android/media/MediaPlayer2Impl.java

+1 −0
Original line number Diff line number Diff line
@@ -1417,6 +1417,7 @@ public final class MediaPlayer2Impl extends MediaPlayer2 { 
    /*

     * Call BEFORE adding a routing callback handler or AFTER removing a routing callback handler.

     */

    @GuardedBy("mRoutingChangeListeners")

    private void enableNativeRoutingCallbacksLocked(boolean enabled) {

        if (mRoutingChangeListeners.size() == 0) {

            native_enableDeviceCallback(enabled);

media/java/android/media/MediaRecorder.java

+1 −0
Original line number Diff line number Diff line
@@ -1353,6 +1353,7 @@ public class MediaRecorder implements AudioRouting 
    /*

     * Call BEFORE adding a routing callback handler or AFTER removing a routing callback handler.

     */

    @GuardedBy("mRoutingChangeListeners")

    private void enableNativeRoutingCallbacksLocked(boolean enabled) {

        if (mRoutingChangeListeners.size() == 0) {

            native_enableDeviceCallback(enabled);