Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable OomAdjProfiler for Q.

Browse Source 
DO NOT MERGE

Bug: 130635979
Test: Confirm 'adb shell dumpsys activity' doesn't include OomAdjProfiler output
Change-Id: I1a88f8fc9f2a566db88ff76d659c52f13a8457f7
This commit is contained in:
Kweku Adams
2019-04-26 17:19:19 -07:00
parent a23242a492
commit 17c0c510be
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
services/core/java/com/android/server/am/OomAdjProfiler.java
View File

@@ -29,6 +29,9 @@ import com.android.internal.util.function.pooled.PooledLambda;
import java.io.PrintWriter;
public class OomAdjProfiler {
// Disable profiling for Q. Re-enable once b/130635979 is fixed.
private static final boolean PROFILING_DISABLED = true;
@GuardedBy("this")
private boolean mOnBattery;
@GuardedBy("this")
@@ -56,6 +59,9 @@ public class OomAdjProfiler {
final RingBuffer<CpuTimes> mSystemServerCpuTimesHist = new RingBuffer<>(CpuTimes.class, 10);
void batteryPowerChanged(boolean onBattery) {
if (PROFILING_DISABLED) {
return;
}
synchronized (this) {
scheduleSystemServerCpuTimeUpdate();
mOnBattery = onBattery;
@@ -63,6 +69,9 @@ public class OomAdjProfiler {
}
void onWakefulnessChanged(int wakefulness) {
if (PROFILING_DISABLED) {
return;
}
synchronized (this) {
scheduleSystemServerCpuTimeUpdate();
mScreenOff = wakefulness != PowerManagerInternal.WAKEFULNESS_AWAKE;
@@ -70,6 +79,9 @@ public class OomAdjProfiler {
}
void oomAdjStarted() {
if (PROFILING_DISABLED) {
return;
}
synchronized (this) {
mOomAdjStartTimeMs = SystemClock.currentThreadTimeMillis();
mOomAdjStarted = true;
@@ -77,6 +89,9 @@ public class OomAdjProfiler {
}
void oomAdjEnded() {
if (PROFILING_DISABLED) {
return;
}
synchronized (this) {
if (!mOomAdjStarted) {
return;
@@ -86,6 +101,9 @@ public class OomAdjProfiler {
}
private void scheduleSystemServerCpuTimeUpdate() {
if (PROFILING_DISABLED) {
return;
}
synchronized (this) {
if (mSystemServerCpuTimeUpdateScheduled) {
return;
@@ -98,6 +116,9 @@ public class OomAdjProfiler {
}
private void updateSystemServerCpuTime(boolean onBattery, boolean screenOff) {
if (PROFILING_DISABLED) {
return;
}
final long cpuTimeMs = mProcessCpuTracker.getCpuTimeForPid(Process.myPid());
synchronized (this) {
mSystemServerCpuTime.addCpuTimeMs(
@@ -121,6 +142,9 @@ public class OomAdjProfiler {
}
void dump(PrintWriter pw) {
if (PROFILING_DISABLED) {
return;
}
synchronized (this) {
if (mSystemServerCpuTimeUpdateScheduled) {
while (mSystemServerCpuTimeUpdateScheduled) {