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

Merge "Revert "More debug for security loggin broadcast"" into sc-dev am: 9ce47a5ab2

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

Change-Id: I71fd3691ffd9231f1e587d869fa78a5c6d17ab13
This commit is contained in:
TreeHugger Robot
2021-06-21 11:42:52 +00:00
committed by Automerger Merge Worker
parent fc36d2f0a7 9ce47a5ab2
commit 3dcfba2d58
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -8030,8 +8030,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
inForeground = true; inForeground = true;
receiverComponent = resolveDelegateReceiver( receiverComponent = resolveDelegateReceiver(
DELEGATION_SECURITY_LOGGING, action, userId); DELEGATION_SECURITY_LOGGING, action, userId);
// STOPSHIP(b/185004808): remove excessive log.
Slogf.d(LOG_TAG, "Delegate for security logs broadcast: " + receiverComponent);
} }
if (receiverComponent == null) { if (receiverComponent == null) {
receiverComponent = getOwnerComponent(userId); receiverComponent = getOwnerComponent(userId);

11
services/devicepolicy/java/com/android/server/devicepolicy/SecurityLogMonitor.java
View File

@@ -64,7 +64,7 @@ class SecurityLogMonitor implements Runnable {
mLastForceNanos = System.nanoTime(); mLastForceNanos = System.nanoTime();
} }
private static final boolean DEBUG = true; // STOPSHIP if true. private static final boolean DEBUG = false; // STOPSHIP if true.
private static final String TAG = "SecurityLogMonitor"; private static final String TAG = "SecurityLogMonitor";
/** /**
* Each log entry can hold up to 4K bytes (but as of {@link android.os.Build.VERSION_CODES#N} * Each log entry can hold up to 4K bytes (but as of {@link android.os.Build.VERSION_CODES#N}
@@ -427,7 +427,7 @@ class SecurityLogMonitor implements Runnable {
while (!Thread.currentThread().isInterrupted()) { while (!Thread.currentThread().isInterrupted()) {
try { try {
final boolean force = mForceSemaphore.tryAcquire(POLLING_INTERVAL_MS, MILLISECONDS); final boolean force = mForceSemaphore.tryAcquire(POLLING_INTERVAL_MS, MILLISECONDS);
if (DEBUG) Slog.d(TAG, "Retrieving next batch, force=" + force);
getNextBatch(newLogs); getNextBatch(newLogs);
mLock.lockInterruptibly(); mLock.lockInterruptibly();
@@ -469,11 +469,6 @@ class SecurityLogMonitor implements Runnable {
return; return;
} }
final int logSize = mPendingLogs.size(); final int logSize = mPendingLogs.size();
if (DEBUG) {
Slog.d(TAG, String.format(
"notifyDeviceOwnerOrProfileOwnerIfNeeded, size: %d now: %d next: %d",
logSize, SystemClock.elapsedRealtime(), mNextAllowedRetrievalTimeMillis));
}
if (logSize >= BUFFER_ENTRIES_NOTIFICATION_LEVEL || (force && logSize > 0)) { if (logSize >= BUFFER_ENTRIES_NOTIFICATION_LEVEL || (force && logSize > 0)) {
// Allow DO to retrieve logs if too many pending logs or if forced. // Allow DO to retrieve logs if too many pending logs or if forced.
if (!mAllowedToRetrieve) { if (!mAllowedToRetrieve) {
@@ -512,7 +507,6 @@ class SecurityLogMonitor implements Runnable {
synchronized (mForceSemaphore) { synchronized (mForceSemaphore) {
final long toWaitNanos = mLastForceNanos + FORCE_FETCH_THROTTLE_NS - nowNanos; final long toWaitNanos = mLastForceNanos + FORCE_FETCH_THROTTLE_NS - nowNanos;
if (toWaitNanos > 0) { if (toWaitNanos > 0) {
if (DEBUG) Slog.d(TAG, "Forcing security logs throttled");
return NANOSECONDS.toMillis(toWaitNanos) + 1; // Round up. return NANOSECONDS.toMillis(toWaitNanos) + 1; // Round up.
} }
mLastForceNanos = nowNanos; mLastForceNanos = nowNanos;
@@ -521,7 +515,6 @@ class SecurityLogMonitor implements Runnable {
if (mForceSemaphore.availablePermits() == 0) { if (mForceSemaphore.availablePermits() == 0) {
mForceSemaphore.release(); mForceSemaphore.release();
} }
if (DEBUG) Slog.d(TAG, "Forcing security logs semaphore released");
return 0; return 0;
} }
} }