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

Merge "Remove incorrect isAppUid check reading memory state" into rvc-dev am: d490578595 am: cb9aae0cf8

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838098

Change-Id: I5a5f2298e10fcbfa76ca8fae3abc2c69f505db99
This commit is contained in:
TreeHugger Robot
2020-06-11 19:11:58 +00:00
committed by Automerger Merge Worker
parent fbd93130f1 cb9aae0cf8
commit 2de9ae5fc3
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
View File

@@ -209,14 +209,6 @@ public class StatsPullAtomService extends SystemService {
// Random seed stable for StatsPullAtomService life cycle - can be used for stable sampling // Random seed stable for StatsPullAtomService life cycle - can be used for stable sampling
private static final int RANDOM_SEED = new Random().nextInt(); private static final int RANDOM_SEED = new Random().nextInt();
/**
* Lowest available uid for apps.
*
* <p>Used to quickly discard memory snapshots of the zygote forks from native process
* measurements.
*/
private static final int MIN_APP_UID = 10_000;
private static final int DIMENSION_KEY_SIZE_HARD_LIMIT = 800; private static final int DIMENSION_KEY_SIZE_HARD_LIMIT = 800;
private static final int DIMENSION_KEY_SIZE_SOFT_LIMIT = 500; private static final int DIMENSION_KEY_SIZE_SOFT_LIMIT = 500;
private static final long APP_OPS_SAMPLING_INITIALIZATION_DELAY_MILLIS = 45000; private static final long APP_OPS_SAMPLING_INITIALIZATION_DELAY_MILLIS = 45000;
@@ -1819,10 +1811,6 @@ public class StatsPullAtomService extends SystemService {
return StatsManager.PULL_SUCCESS; return StatsManager.PULL_SUCCESS;
} }
private static boolean isAppUid(int uid) {
return uid >= MIN_APP_UID;
}
private void registerProcessMemoryHighWaterMark() { private void registerProcessMemoryHighWaterMark() {
int tagId = FrameworkStatsLog.PROCESS_MEMORY_HIGH_WATER_MARK; int tagId = FrameworkStatsLog.PROCESS_MEMORY_HIGH_WATER_MARK;
mStatsManager.setPullAtomCallback( mStatsManager.setPullAtomCallback(
@@ -1859,7 +1847,7 @@ public class StatsPullAtomService extends SystemService {
int size = processCmdlines.size(); int size = processCmdlines.size();
for (int i = 0; i < size; ++i) { for (int i = 0; i < size; ++i) {
final MemorySnapshot snapshot = readMemorySnapshotFromProcfs(processCmdlines.keyAt(i)); final MemorySnapshot snapshot = readMemorySnapshotFromProcfs(processCmdlines.keyAt(i));
if (snapshot == null || isAppUid(snapshot.uid)) { if (snapshot == null) {
continue; continue;
} }
StatsEvent e = StatsEvent.newBuilder() StatsEvent e = StatsEvent.newBuilder()
@@ -1920,7 +1908,7 @@ public class StatsPullAtomService extends SystemService {
for (int i = 0; i < size; ++i) { for (int i = 0; i < size; ++i) {
int pid = processCmdlines.keyAt(i); int pid = processCmdlines.keyAt(i);
final MemorySnapshot snapshot = readMemorySnapshotFromProcfs(pid); final MemorySnapshot snapshot = readMemorySnapshotFromProcfs(pid);
if (snapshot == null || isAppUid(snapshot.uid)) { if (snapshot == null) {
continue; continue;
} }
StatsEvent e = StatsEvent.newBuilder() StatsEvent e = StatsEvent.newBuilder()