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

Merge "Update process_state_changed logging" into rvc-dev am: 144788b5bb

Browse Source 
Change-Id: I391161333f2731e08433bd0acd49c7ebff752559
This commit is contained in:
Jeffrey Huang
2020-04-28 23:12:01 +00:00
committed by Automerger Merge Worker
parent f87ba42f88 144788b5bb
commit d414cb4a07
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/com/android/internal/os/BatteryStatsImpl.java
View File

@@ -4009,6 +4009,11 @@ public class BatteryStatsImpl extends BatteryStats {
// Otherwise the parent's process state will get downgraded incorrectly // Otherwise the parent's process state will get downgraded incorrectly
return; return;
} }
// TODO(b/155216561): It is possible for isolated uids to be in a higher
// state than its parent uid. We should track the highest state within the union of host
// and isolated uids rather than only the parent uid.
FrameworkStatsLog.write(FrameworkStatsLog.UID_PROCESS_STATE_CHANGED, uid,
ActivityManager.processStateAmToProto(state));
getUidStatsLocked(uid).updateUidProcessStateLocked(state); getUidStatsLocked(uid).updateUidProcessStateLocked(state);
} }

4
services/core/java/com/android/server/am/BatteryStatsService.java
View File

@@ -16,7 +16,6 @@
package com.android.server.am; package com.android.server.am;
import android.app.ActivityManager;
import android.bluetooth.BluetoothActivityEnergyInfo; import android.bluetooth.BluetoothActivityEnergyInfo;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
@@ -376,9 +375,6 @@ public final class BatteryStatsService extends IBatteryStats.Stub
/** @param state Process state from ActivityManager.java. */ /** @param state Process state from ActivityManager.java. */
void noteUidProcessState(int uid, int state) { void noteUidProcessState(int uid, int state) {
synchronized (mStats) { synchronized (mStats) {
FrameworkStatsLog.write(FrameworkStatsLog.UID_PROCESS_STATE_CHANGED, uid,
ActivityManager.processStateAmToProto(state));
mStats.noteUidProcessStateLocked(uid, state); mStats.noteUidProcessStateLocked(uid, state);
} }
} }