commit 0b1e46969a5a0cf8cb64a3322ddec2a502fc2a4f
author Atneya Nair <atneya@google.com> Wed Apr 17 16:15:38 2024 -0700
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Tue Apr 23 23:47:57 2024 +0000
tree 3643f4e2275fa4a805461d93bfcb4ee0abec0aaf
parent 7e5c107f1185f2a1ab1488c7a59fcaa5d18768f9

Move AudioService recv off of main thread

Some of the calls in the AudioService broadcast receiver are expensive,
and posting them to the main thread can lead to slow-down/ANR.
Additionally, there is no need to handle these events on the main
thread.

Move the receiver to a dedicated handler thread. Eventually, this should
be combined with the handler we already have for events.

Test: Smoke test (bt connect)
Fixes: 335457435
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b7c3f0488a0943a832a49b070b95f93deeff402b)
Merged-In: Ibc6b95f7bd628a63c565adfa7f5d52cdcda9fb1b
Change-Id: Ibc6b95f7bd628a63c565adfa7f5d52cdcda9fb1b

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

diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 45076d04..877b90f 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -173,6 +173,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.HandlerThread;
 import android.os.HwBinder;
 import android.os.IBinder;
 import android.os.Looper;
@@ -683,6 +684,9 @@
     private static final VibrationAttributes TOUCH_VIBRATION_ATTRIBUTES =
             VibrationAttributes.createForUsage(VibrationAttributes.USAGE_TOUCH);
 
+    // Handler for broadcast receiver
+    // TODO(b/335513647) combine handlers
+    private final HandlerThread mBroadcastHandlerThread;
     // Broadcast receiver for device connections intent broadcasts
     private final BroadcastReceiver mReceiver = new AudioServiceBroadcastReceiver();
 
@@ -1118,6 +1122,9 @@
         mAudioPolicy = audioPolicy;
         mPlatformType = AudioSystem.getPlatformType(context);
 
+        mBroadcastHandlerThread = new HandlerThread("AudioService Broadcast");
+        mBroadcastHandlerThread.start();
+
         mDeviceBroker = new AudioDeviceBroker(mContext, this, mAudioSystem);
 
         mIsSingleVolume = AudioSystem.isSingleVolume(context);
@@ -1504,7 +1511,8 @@
         intentFilter.addAction(ACTION_CHECK_MUSIC_ACTIVE);
         intentFilter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
 
-        mContext.registerReceiverAsUser(mReceiver, UserHandle.ALL, intentFilter, null, null,
+        mContext.registerReceiverAsUser(mReceiver, UserHandle.ALL, intentFilter, null,
+                mBroadcastHandlerThread.getThreadHandler(),
                 Context.RECEIVER_EXPORTED);
 
         SubscriptionManager subscriptionManager = mContext.getSystemService(