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

Commit 51b930aa authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "AudioDeviceInventory: fix Bluetooth profile disconnection metrics" into... 

Merge "AudioDeviceInventory: fix Bluetooth profile disconnection metrics" into udc-qpr-dev am: d39c4028 am: 691861a9

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



Change-Id: Iecb23fe7719ed1afd0bb95577c898927382e65dd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9a8789d3 691861a9

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -1437,6 +1437,7 @@ public class AudioDeviceInventory { 
                }

                }

            });

            });

            new MediaMetrics.Item(mMetricsId + "disconnectA2dp")

            new MediaMetrics.Item(mMetricsId + "disconnectA2dp")

                    .set(MediaMetrics.Property.EVENT, "disconnectA2dp")

                    .record();

                    .record();

            if (toRemove.size() > 0) {

            if (toRemove.size() > 0) {

                final int delay = checkSendBecomingNoisyIntentInt(

                final int delay = checkSendBecomingNoisyIntentInt(
@@ -1459,6 +1460,7 @@ public class AudioDeviceInventory { 
                }

                }

            });

            });

            new MediaMetrics.Item(mMetricsId + "disconnectA2dpSink")

            new MediaMetrics.Item(mMetricsId + "disconnectA2dpSink")

                    .set(MediaMetrics.Property.EVENT, "disconnectA2dpSink")

                    .record();

                    .record();

            toRemove.stream().forEach(deviceAddress -> makeA2dpSrcUnavailable(deviceAddress));

            toRemove.stream().forEach(deviceAddress -> makeA2dpSrcUnavailable(deviceAddress));

        }

        }
@@ -1474,6 +1476,7 @@ public class AudioDeviceInventory { 
                }

                }

            });

            });

            new MediaMetrics.Item(mMetricsId + "disconnectHearingAid")

            new MediaMetrics.Item(mMetricsId + "disconnectHearingAid")

                    .set(MediaMetrics.Property.EVENT, "disconnectHearingAid")

                    .record();

                    .record();

            if (toRemove.size() > 0) {

            if (toRemove.size() > 0) {

                final int delay = checkSendBecomingNoisyIntentInt(

                final int delay = checkSendBecomingNoisyIntentInt(
@@ -1531,6 +1534,7 @@ public class AudioDeviceInventory { 
                }

                }

            });

            });

            new MediaMetrics.Item(mMetricsId + "disconnectLeAudio")

            new MediaMetrics.Item(mMetricsId + "disconnectLeAudio")

                    .set(MediaMetrics.Property.EVENT, "disconnectLeAudio")

                    .record();

                    .record();

            if (toRemove.size() > 0) {

            if (toRemove.size() > 0) {

                final int delay = checkSendBecomingNoisyIntentInt(device,

                final int delay = checkSendBecomingNoisyIntentInt(device,