From dbcba765093e9a3aade1d574ac9a5b0c7f94ca59 Mon Sep 17 00:00:00 2001
From: Connor O'Brien <connoro@google.com>
Date: Wed, 24 Feb 2021 00:37:10 +0000
Subject: Revert "Revert "Clear BPF data in
 KernelCpuUidTimeReader.removeUid()""

This reverts commit 0648bad1b66062de34297c7ed3bdf08684907213.

Reason for revert: commit 0208449c3b1e9de505b6bfef005c616640178f86 ("Defer UID data removal until after reading is finished") has now been merged to remove the deadlock that required reverting.

Bug: 177011744
Bug: 174739872
Change-Id: I4fc120dc4410e21327700cb62900b3991ec981ec
---
 core/java/com/android/internal/os/KernelCpuUidTimeReader.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/java/com/android/internal/os/KernelCpuUidTimeReader.java b/core/java/com/android/internal/os/KernelCpuUidTimeReader.java
index f7fad2c5bbaa..2dd51b4459e7 100644
--- a/core/java/com/android/internal/os/KernelCpuUidTimeReader.java
+++ b/core/java/com/android/internal/os/KernelCpuUidTimeReader.java
@@ -143,6 +143,10 @@ public abstract class KernelCpuUidTimeReader<T> {
      */
     public void removeUid(int uid) {
         mLastTimes.delete(uid);
+
+        if (mBpfTimesAvailable) {
+            mBpfReader.removeUidsInRange(uid, uid);
+        }
     }
 
     /**
-- 
cgit v1.2.3-59-g8ed1b