Merge "Stop using temp-allowlist reason to identify push msgs." into tm-dev am: ed144a5780
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17747665 Change-Id: Ic2400dfe00b1c15165058f4ca5318a6bcc908edd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -61,7 +61,6 @@ import android.os.Handler;
|
||||
import android.os.IBinder;
|
||||
import android.os.Looper;
|
||||
import android.os.Message;
|
||||
import android.os.PowerExemptionManager;
|
||||
import android.os.PowerExemptionManager.ReasonCode;
|
||||
import android.os.PowerExemptionManager.TempAllowListType;
|
||||
import android.os.Process;
|
||||
@@ -1934,9 +1933,6 @@ public final class BroadcastQueue {
|
||||
}
|
||||
|
||||
private void maybeReportBroadcastDispatchedEventLocked(BroadcastRecord r, int targetUid) {
|
||||
// STOPSHIP (217251579): Temporarily use temp-allowlist reason to identify
|
||||
// push messages and record response events.
|
||||
useTemporaryAllowlistReasonAsSignal(r);
|
||||
if (r.options == null || r.options.getIdForResponseEvent() <= 0) {
|
||||
return;
|
||||
}
|
||||
@@ -1951,17 +1947,6 @@ public final class BroadcastQueue {
|
||||
mService.getUidStateLocked(targetUid));
|
||||
}
|
||||
|
||||
private void useTemporaryAllowlistReasonAsSignal(BroadcastRecord r) {
|
||||
if (r.options == null || r.options.getIdForResponseEvent() > 0) {
|
||||
return;
|
||||
}
|
||||
final int reasonCode = r.options.getTemporaryAppAllowlistReasonCode();
|
||||
if (reasonCode == PowerExemptionManager.REASON_PUSH_MESSAGING
|
||||
|| reasonCode == PowerExemptionManager.REASON_PUSH_MESSAGING_OVER_QUOTA) {
|
||||
r.options.recordResponseEventWhileInBackground(reasonCode);
|
||||
}
|
||||
}
|
||||
|
||||
@NonNull
|
||||
private UsageStatsManagerInternal getUsageStatsManagerInternal() {
|
||||
final UsageStatsManagerInternal usageStatsManagerInternal =
|
||||
|
||||
Reference in New Issue
Block a user