bbe06e7b598e5249e40c06b6bf2c563ad94e00f5 - platform_frameworks_base

commit	bbe06e7b598e5249e40c06b6bf2c563ad94e00f5	[log] [tgz]
author	Li Li <dualli@google.com>	Wed Jul 28 11:27:26 2021 -0700
committer	Li Li <dualli@google.com>	Thu Jul 29 09:18:53 2021 -0700
tree	7a17bc5dd53f0559048d98e765e652e63a67d549
parent	92145ddf77aac1f6cf9816b99086be89ff69f4ab [diff]

Freezer: fix exception when parsing /proc/locks

The original code is based on /proc/locks manpage. Unfortunately, that
manpage is never correctly updated to include the new field for blocked
locks. The new code detects the extra field. As StringTokenizer is too
heavy, ProcFileReader is used for better performance.

Bug: 194756340
Test: FrameworksUtilTests com.android.internal.util.ProcFileReaderTest
Test: FrameworksCoreTests com.android.internal.os.ProcLocksReaderTest
Test: No /proc/locks parsing exception with blocked locks
Change-Id: I4c9763f9d3091f7d84d2e4b672d7e5cb78b33f59

core/java/android/os/Process.java[diff]
core/java/com/android/internal/os/ProcLocksReader.java[Added - diff]
core/java/com/android/internal/util/ProcFileReader.java[diff]
core/tests/coretests/src/com/android/internal/os/ProcLocksReaderTest.java[Added - diff]
core/tests/utiltests/src/com/android/internal/util/ProcFileReaderTest.java[diff]
services/core/java/com/android/server/am/CachedAppOptimizer.java[diff]

6 files changed