From 8b6dc9b3ed39ce585c57e4c2a602516cfdbd6780 Mon Sep 17 00:00:00 2001
From: Etienne Ruffieux <eruffieux@google.com>
Date: Thu, 27 Jan 2022 18:27:49 +0000
Subject: [PATCH] Added BinderCallsStats Bluetooth initialization

Tag: #feature
Bug: 195146428
Test: manual
Change-Id: Ia9e35c8299fc039da977018eab84402c2ba0caab
---
 core/java/android/app/ActivityThread.java             |  3 +++
 .../com/android/internal/os/BinderCallsStats.java     | 11 +++++++++++
 2 files changed, 14 insertions(+)

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index ea62714122897..24e2bc9091cc6 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -201,6 +201,7 @@ import com.android.internal.annotations.GuardedBy;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.app.IVoiceInteractor;
 import com.android.internal.content.ReferrerIntent;
+import com.android.internal.os.BinderCallsStats;
 import com.android.internal.os.BinderInternal;
 import com.android.internal.os.RuntimeInit;
 import com.android.internal.os.SomeArgs;
@@ -7922,6 +7923,8 @@ public final class ActivityThread extends ClientTransactionHandler
         MediaFrameworkPlatformInitializer.setMediaServiceManager(new MediaServiceManager());
         MediaFrameworkInitializer.setMediaServiceManager(new MediaServiceManager());
         BluetoothFrameworkInitializer.setBluetoothServiceManager(new BluetoothServiceManager());
+        BluetoothFrameworkInitializer.setBinderCallsStatsInitializer(context -> {
+            BinderCallsStats.startForBluetooth(context); });
     }
 
     private void purgePendingResources() {
diff --git a/core/java/com/android/internal/os/BinderCallsStats.java b/core/java/com/android/internal/os/BinderCallsStats.java
index be91aaca5d393..0a29fc5285a54 100644
--- a/core/java/com/android/internal/os/BinderCallsStats.java
+++ b/core/java/com/android/internal/os/BinderCallsStats.java
@@ -1159,6 +1159,17 @@ public class BinderCallsStats implements BinderInternal.Observer {
                 : Integer.compare(a.transactionCode, b.transactionCode);
     }
 
+    /** @hide */
+    public static void startForBluetooth(Context context) {
+        new BinderCallsStats.SettingsObserver(
+                    context,
+                    new BinderCallsStats(
+                            new BinderCallsStats.Injector(),
+                              com.android.internal.os.BinderLatencyProto.Dims.BLUETOOTH));
+
+    }
+
+
 
     /**
      * Settings observer for other processes (not system_server).