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

Commit 7b0e033b authored by Robert-Reinhold Gross's avatar Robert-Reinhold Gross Committed by Automerger Merge Worker
Browse files

Merge "Check if getParameters reply contains the required key" into main am:... 

Merge "Check if getParameters reply contains the required key" into main am: d73ad26a am: d7738e13

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3482893



Change-Id: I38c4644b29823076b16063eb7b1f5a25ee02bee3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ddbaafe0 d7738e13

services/core/java/com/android/server/audio/AudioService.java

+14 −10
Original line number Diff line number Diff line
@@ -15082,12 +15082,14 @@ public class AudioService extends IAudioService.Stub 
        final String key = "additional_output_device_delay";

        final String reply = AudioSystem.getParameters(

                key + "=" + device.getInternalType() + "," + device.getAddress());

        long delayMillis;

        long delayMillis = 0;

        if (reply.contains(key)) {

            try {

                delayMillis = Long.parseLong(reply.substring(key.length() + 1));

            } catch (NullPointerException e) {

                delayMillis = 0;

            }

        }

        return delayMillis;

    }









@@ -15112,12 +15114,14 @@ public class AudioService extends IAudioService.Stub













        final String key = "max_additional_output_device_delay";















        final String reply = AudioSystem.getParameters(















                key + "=" + device.getInternalType() + "," + device.getAddress());













        long delayMillis;













        long delayMillis = 0;













        if (reply.contains(key)) {















            try {















                delayMillis = Long.parseLong(reply.substring(key.length() + 1));















            } catch (NullPointerException e) {















                delayMillis = 0;















            }













        }















        return delayMillis;















    }