Merge "Don't apply broadcast deferral policy to system uids" (df5caf27) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/BroadcastQueue.java

+15 −7

Original line number	Diff line number	Diff line
		@@ -477,6 +477,8 @@ public final class BroadcastQueue {
		// when processNextBroadcastLocked() next finds this uid as a receiver identity.
		if (!r.timeoutExempt) {
		if (mConstants.SLOW_TIME > 0 && elapsed > mConstants.SLOW_TIME) {
		// Core system packages are exempt from deferral policy
		if (!UserHandle.isCore(r.curApp.uid)) {
		if (DEBUG_BROADCAST_DEFERRAL) {
		Slog.i(TAG_BROADCAST, "Broadcast receiver " + (r.nextReceiver - 1)
		+ " was slow: " + receiver + " br=" + r);
		@@ -486,6 +488,12 @@ public final class BroadcastQueue {
		} else {
		Slog.d(TAG_BROADCAST, "finish receiver curApp is null? " + r);
		}
		} else {
		if (DEBUG_BROADCAST_DEFERRAL) {
		Slog.i(TAG_BROADCAST, "Core uid " + r.curApp.uid
		+ " receiver was slow but not deferring: " + receiver + " br=" + r);
		}
		}
		}
		} else {
		if (DEBUG_BROADCAST_DEFERRAL) {