Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6ef026c authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Automerger Merge Worker
Browse files

Merge "Stop using temp-allowlist reason to identify push msgs." into tm-dev... 

Merge "Stop using temp-allowlist reason to identify push msgs." into tm-dev am: ed144a57 am: e078b680

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



Change-Id: If234c1e5b132935b9bcebb09252bbed3efc7eb82
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d8c719e8 e078b680

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

+0 −15
Original line number Diff line number Diff line
@@ -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 =