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

Merge "Fix problem of logd restarting." into udc-qpr-dev

Browse Source
This commit is contained in:
Christopher Ferris
2023-08-10 22:36:10 +00:00
committed by Android (Google) Code Review
parent c358f7fb23 9f007535c5
commit d7ab422d1b
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,7 @@ import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Build;
import android.os.DeadObjectException;
import android.os.Handler;
import android.os.ILogd;
import android.os.Looper;
@@ -518,7 +519,15 @@ public final class LogcatManagerService extends SystemService {
Slog.d(TAG, "Approving log access: " + request);
}
try {
getLogdService().approve(request.mUid, request.mGid, request.mPid, request.mFd);
try {
getLogdService().approve(request.mUid, request.mGid, request.mPid, request.mFd);
} catch (DeadObjectException e) {
// This can happen if logd restarts, so force getting a new connection
// to logd and try once more.
Slog.w(TAG, "Logd connection no longer valid while approving, trying once more.");
mLogdService = null;
getLogdService().approve(request.mUid, request.mGid, request.mPid, request.mFd);
}
Integer activeCount = mActiveLogAccessCount.getOrDefault(client, 0);
mActiveLogAccessCount.put(client, activeCount + 1);
} catch (RemoteException e) {
@@ -531,7 +540,15 @@ public final class LogcatManagerService extends SystemService {
Slog.d(TAG, "Declining log access: " + request);
}
try {
getLogdService().decline(request.mUid, request.mGid, request.mPid, request.mFd);
try {
getLogdService().decline(request.mUid, request.mGid, request.mPid, request.mFd);
} catch (DeadObjectException e) {
// This can happen if logd restarts, so force getting a new connection
// to logd and try once more.
Slog.w(TAG, "Logd connection no longer valid while declining, trying once more.");
mLogdService = null;
getLogdService().decline(request.mUid, request.mGid, request.mPid, request.mFd);
}
} catch (RemoteException e) {
Slog.e(TAG, "Fails to call remote functions", e);
}