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

Merge "Revert "Short term fix: Allow native processes for Logcat data access""

Browse Source
This commit is contained in:
Wenhao Wang
2022-02-09 18:36:21 +00:00
committed by Android (Google) Code Review
parent 820ef8feb1 aa2a4852e4
commit 13829b617c
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/logcat/LogcatManagerService.java
View File

@@ -59,7 +59,7 @@ public final class LogcatManagerService extends SystemService {
private ActivityManagerInternal mActivityManagerInternal;
private static final int MAX_UID_IMPORTANCE_COUNT_LISTENER = 2;
private static int sUidImportanceListenerCount = 0;
private static final int AID_APP_UID = 10000;
private static final int AID_SHELL_UID = 2000;
// TODO This allowlist is just a temporary workaround for the tests:
// FrameworksServicesTests
@@ -339,10 +339,8 @@ public final class LogcatManagerService extends SystemService {
return;
}
// If the access request is coming from native apps, approve the logd access
// TODO: This is needed to make tooling to work. However,
// we intend to be stricter with respect to native processes in a follow-up CL
if (mUid < AID_APP_UID) {
// If the access request is coming from adb shell, approve the logd access
if (mUid == AID_SHELL_UID) {
try {
getLogdService().approve(mUid, mGid, mPid, mFd);
} catch (RemoteException e) {