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

Commit 151be6c1 authored by Kweku Adams's avatar Kweku Adams Committed by Automerger Merge Worker
Browse files

Merge "Enable ANR trigger for slow app responses." into udc-dev am: 2b79df8f 

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



Change-Id: Ib7e409dbc444d55ad8cecedc820e9e0387a91de5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 790d695d 2b79df8f

apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java

+1 −4
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import android.app.job.JobProtoEnums; 
import android.app.job.JobWorkItem;

import android.app.usage.UsageStatsManagerInternal;

import android.compat.annotation.ChangeId;

import android.compat.annotation.Disabled;

import android.compat.annotation.EnabledAfter;

import android.content.ComponentName;

import android.content.Context;
@@ -97,9 +96,7 @@ public final class JobServiceContext implements ServiceConnection { 
     * Whether to trigger an ANR when apps are slow to respond on pre-UDC APIs and functionality.

     */

    @ChangeId

    @Disabled

    // TODO(258236856): Enable after test is fixed

    // @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.TIRAMISU)

    @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.TIRAMISU)

    private static final long ANR_PRE_UDC_APIS_ON_SLOW_RESPONSES = 258236856L;



    private static final String TAG = "JobServiceContext";