From e683a424557ce30ca2c1ed3e4a55b60b258d2e2a Mon Sep 17 00:00:00 2001
From: Siim Sammul <siims@google.com>
Date: Mon, 15 Aug 2022 11:25:37 +0000
Subject: [PATCH] Revert "Initialize binder latency histograms collection via
 Bind..."

Revert "Initialize binder latency histograms collection via Bind..."

Revert submission 17123043-binder-latency-wifi

Reason for revert: unexpected increased memory usage
Reverted Changes:
I2cb0f7b69:Initialize binder latency histograms collection vi...
Id12e3a515:Fix unit tests due to change to binder latency col...
I26dbd757b:Add cts test for WifiFrameworkInitializer for bind...
I0d76cbcb3:Initialize binder latency histograms collection vi...

Change-Id: Ic1450c59e5fdea37133856711f50c90c97e42325
---
 core/java/android/app/ActivityThread.java               | 3 ---
 core/java/com/android/internal/os/BinderCallsStats.java | 8 --------
 2 files changed, 11 deletions(-)

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 6b3dc820635e4..b383d7daafd06 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -107,7 +107,6 @@ import android.net.ConnectivityManager;
 import android.net.Proxy;
 import android.net.TrafficStats;
 import android.net.Uri;
-import android.net.wifi.WifiFrameworkInitializer;
 import android.os.AsyncTask;
 import android.os.Binder;
 import android.os.BluetoothServiceManager;
@@ -7901,8 +7900,6 @@ public final class ActivityThread extends ClientTransactionHandler
         BluetoothFrameworkInitializer.setBluetoothServiceManager(new BluetoothServiceManager());
         BluetoothFrameworkInitializer.setBinderCallsStatsInitializer(context -> {
             BinderCallsStats.startForBluetooth(context); });
-        WifiFrameworkInitializer.setBinderCallsStatsInitializer(context -> {
-            BinderCallsStats.startForWifi(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 fa6fa55cbde94..0a29fc5285a54 100644
--- a/core/java/com/android/internal/os/BinderCallsStats.java
+++ b/core/java/com/android/internal/os/BinderCallsStats.java
@@ -1169,15 +1169,7 @@ public class BinderCallsStats implements BinderInternal.Observer {
 
     }
 
-    /** @hide */
-    public static void startForWifi(Context context) {
-        new BinderCallsStats.SettingsObserver(
-            context,
-            new BinderCallsStats(
-                new BinderCallsStats.Injector(),
-                com.android.internal.os.BinderLatencyProto.Dims.WIFI));
 
-    }
 
     /**
      * Settings observer for other processes (not system_server).