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

Commit 817fb942 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9084753 from 8f569191 to tm-qpr1-release 

Change-Id: Ib24bd0552a63881f85c6fefa84f02d592ecd96e5
parents 52df1533 8f569191

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

+5 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import android.os.Looper; 
import android.os.Message;

import android.os.PowerManager;

import android.os.RemoteException;

import android.os.Trace;

import android.os.UserHandle;

import android.util.EventLog;

import android.util.IndentingPrintWriter;
@@ -361,6 +362,9 @@ public final class JobServiceContext implements ServiceConnection { 
                    job.getJob().getPriority(),

                    job.getEffectivePriority(),

                    job.getNumFailures());

            // Use the context's ID to distinguish traces since there'll only be one job running

            // per context.

            Trace.asyncTraceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, job.getTag(), getId());

            try {

                mBatteryStats.noteJobStart(job.getBatteryName(), job.getSourceUid());

            } catch (RemoteException e) {
@@ -1024,6 +1028,7 @@ public final class JobServiceContext implements ServiceConnection { 
                completedJob.getJob().getPriority(),

                completedJob.getEffectivePriority(),

                completedJob.getNumFailures());

        Trace.asyncTraceEnd(Trace.TRACE_TAG_SYSTEM_SERVER, completedJob.getTag(), getId());

        try {

            mBatteryStats.noteJobFinish(mRunningJob.getBatteryName(), mRunningJob.getSourceUid(),

                    internalStopReason);

apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java

+1 −1
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ public final class JobStatus { 
        this.batteryName = this.sourceTag != null

                ? this.sourceTag + ":" + job.getService().getPackageName()

                : job.getService().flattenToShortString();

        this.tag = "*job*/" + this.batteryName;

        this.tag = "*job*/" + this.batteryName + "#" + job.getId();



        this.earliestRunTimeElapsedMillis = earliestRunTimeElapsedMillis;

        this.latestRunTimeElapsedMillis = latestRunTimeElapsedMillis;

core/java/android/hardware/biometrics/BiometricFingerprintConstants.java

+9 −8
Original line number Diff line number Diff line
@@ -315,17 +315,17 @@ public interface BiometricFingerprintConstants { 
    int FINGERPRINT_ACQUIRED_VENDOR_BASE = 1000;



    /**

     * Whether the FingerprintAcquired message is a signal to turn off HBM

     * Whether the FingerprintAcquired message is a signal to disable the UDFPS display mode.

     * We want to disable the UDFPS mode as soon as possible to conserve power and provide better

     * UX. For example, prolonged high-brightness illumination of optical sensors can be unpleasant

     * to the user, can cause long term display burn-in, and can drain the battery faster.

     */

    static boolean shouldTurnOffHbm(@FingerprintAcquired int acquiredInfo) {

    static boolean shouldDisableUdfpsDisplayMode(@FingerprintAcquired int acquiredInfo) {

        switch (acquiredInfo) {

            case FINGERPRINT_ACQUIRED_START:

                // Authentication just began

                // Keep the UDFPS mode because the authentication just began.

                return false;

            case FINGERPRINT_ACQUIRED_GOOD:

                // Good image captured. Turn off HBM. Success/Reject comes after, which is when

                // hideUdfpsOverlay will be called.

                return true;

            case FINGERPRINT_ACQUIRED_PARTIAL:

            case FINGERPRINT_ACQUIRED_INSUFFICIENT:

            case FINGERPRINT_ACQUIRED_IMAGER_DIRTY:
@@ -334,11 +334,12 @@ public interface BiometricFingerprintConstants { 
            case FINGERPRINT_ACQUIRED_IMMOBILE:

            case FINGERPRINT_ACQUIRED_TOO_BRIGHT:

            case FINGERPRINT_ACQUIRED_VENDOR:

                // Bad image captured. Turn off HBM. Matcher will not run, so there's no need to

                // keep HBM on.

                // Disable the UDFPS mode because the image capture has finished. The overlay

                // can be hidden later, once the authentication result arrives.

                return true;

            case FINGERPRINT_ACQUIRED_UNKNOWN:

            default:

                // Keep the UDFPS mode in case of an unknown message.

                return false;

        }

    }

core/java/com/android/internal/jank/TEST_MAPPING

0 → 100644
+22 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "FrameworksCoreTests",

      "options": [

        {

          "include-filter": "com.android.internal.jank"

        },

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        },

        {

          "exclude-annotation": "org.junit.Ignore"

        }

      ],

      "file_patterns": [

        "core/java/com/android/internal/jank/.*",

        "core/tests/coretests/src/com/android/internal/jank/.*"

      ]

    }

  ]

}

core/java/com/android/internal/util/LatencyTracker.java

+79 −46
Original line number Diff line number Diff line
@@ -16,6 +16,27 @@ package com.android.internal.util; 


import static android.os.Trace.TRACE_TAG_APP;



import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_CHECK_CREDENTIAL;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_CHECK_CREDENTIAL_UNLOCKED;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_EXPAND_PANEL;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_FACE_WAKE_AND_UNLOCK;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_FINGERPRINT_WAKE_AND_UNLOCK;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_FOLD_TO_AOD;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_LOAD_SHARE_SHEET;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_LOCKSCREEN_UNLOCK;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_ROTATE_SCREEN;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_ROTATE_SCREEN_CAMERA_CHECK;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_ROTATE_SCREEN_SENSOR;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_SHOW_BACK_ARROW;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_SHOW_SELECTION_TOOLBAR;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_START_RECENTS_ANIMATION;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_SWITCH_DISPLAY_UNFOLD;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_TOGGLE_RECENTS;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_TURN_ON_SCREEN;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_UDFPS_ILLUMINATE;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_USER_SWITCH;

import static com.android.internal.util.FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__UNKNOWN_ACTION;



import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -30,6 +51,7 @@ import android.util.Log; 
import android.util.SparseArray;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.logging.EventLogTags;

import com.android.internal.os.BackgroundThread;
@@ -103,14 +125,14 @@ public class LatencyTracker { 
    public static final int ACTION_START_RECENTS_ANIMATION = 8;



    /**

     * Time it takes the sensor to detect rotation.

     * Time it takes to for the camera based algorithm to rotate the screen.

     */

    public static final int ACTION_ROTATE_SCREEN_SENSOR = 9;

    public static final int ACTION_ROTATE_SCREEN_CAMERA_CHECK = 9;



    /**

     * Time it takes to for the camera based algorithm to rotate the screen.

     * Time it takes the sensor to detect rotation.

     */

    public static final int ACTION_ROTATE_SCREEN_CAMERA_CHECK = 10;

    public static final int ACTION_ROTATE_SCREEN_SENSOR = 10;



    /**

     * Time it takes to start unlock animation .
@@ -142,10 +164,15 @@ public class LatencyTracker { 
     */

    public static final int ACTION_LOAD_SHARE_SHEET = 16;



    /**

     * Time it takes for showing the selection toolbar.

     */

    public static final int ACTION_SHOW_SELECTION_TOOLBAR = 17;



    /**

     * Time it takes to show AOD display after folding the device.

     */

    public static final int ACTION_FOLD_TO_AOD = 17;

    public static final int ACTION_FOLD_TO_AOD = 18;



    private static final int[] ACTIONS_ALL = {

        ACTION_EXPAND_PANEL,
@@ -157,14 +184,15 @@ public class LatencyTracker { 
        ACTION_ROTATE_SCREEN,

        ACTION_FACE_WAKE_AND_UNLOCK,

        ACTION_START_RECENTS_ANIMATION,

        ACTION_ROTATE_SCREEN_SENSOR,

        ACTION_ROTATE_SCREEN_CAMERA_CHECK,

        ACTION_ROTATE_SCREEN_SENSOR,

        ACTION_LOCKSCREEN_UNLOCK,

        ACTION_USER_SWITCH,

        ACTION_SWITCH_DISPLAY_UNFOLD,

        ACTION_UDFPS_ILLUMINATE,

        ACTION_SHOW_BACK_ARROW,

        ACTION_LOAD_SHARE_SHEET,

        ACTION_SHOW_SELECTION_TOOLBAR,

        ACTION_FOLD_TO_AOD,

    };
@@ -179,39 +207,42 @@ public class LatencyTracker { 
        ACTION_ROTATE_SCREEN,

        ACTION_FACE_WAKE_AND_UNLOCK,

        ACTION_START_RECENTS_ANIMATION,

        ACTION_ROTATE_SCREEN_SENSOR,

        ACTION_ROTATE_SCREEN_CAMERA_CHECK,

        ACTION_ROTATE_SCREEN_SENSOR,

        ACTION_LOCKSCREEN_UNLOCK,

        ACTION_USER_SWITCH,

        ACTION_SWITCH_DISPLAY_UNFOLD,

        ACTION_UDFPS_ILLUMINATE,

        ACTION_SHOW_BACK_ARROW,

        ACTION_LOAD_SHARE_SHEET,

        ACTION_FOLD_TO_AOD

        ACTION_SHOW_SELECTION_TOOLBAR,

        ACTION_FOLD_TO_AOD,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface Action {

    }



    private static final int[] STATSD_ACTION = new int[]{

            FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_EXPAND_PANEL,

            FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_TOGGLE_RECENTS,

            FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_FINGERPRINT_WAKE_AND_UNLOCK,

            FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_CHECK_CREDENTIAL,

            FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_CHECK_CREDENTIAL_UNLOCKED,

            FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_TURN_ON_SCREEN,

            FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_ROTATE_SCREEN,

            FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_FACE_WAKE_AND_UNLOCK,

            FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_START_RECENTS_ANIMATION,

            FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_ROTATE_SCREEN_SENSOR,

            FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_ROTATE_SCREEN_CAMERA_CHECK,

            FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_LOCKSCREEN_UNLOCK,

            FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_USER_SWITCH,

            FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_SWITCH_DISPLAY_UNFOLD,

            FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_UDFPS_ILLUMINATE,

            FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_SHOW_BACK_ARROW,

            FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_LOAD_SHARE_SHEET,

            FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_FOLD_TO_AOD

    @VisibleForTesting

    public static final int[] STATSD_ACTION = new int[] {

            UIACTION_LATENCY_REPORTED__ACTION__ACTION_EXPAND_PANEL,

            UIACTION_LATENCY_REPORTED__ACTION__ACTION_TOGGLE_RECENTS,

            UIACTION_LATENCY_REPORTED__ACTION__ACTION_FINGERPRINT_WAKE_AND_UNLOCK,

            UIACTION_LATENCY_REPORTED__ACTION__ACTION_CHECK_CREDENTIAL,

            UIACTION_LATENCY_REPORTED__ACTION__ACTION_CHECK_CREDENTIAL_UNLOCKED,

            UIACTION_LATENCY_REPORTED__ACTION__ACTION_TURN_ON_SCREEN,

            UIACTION_LATENCY_REPORTED__ACTION__ACTION_ROTATE_SCREEN,

            UIACTION_LATENCY_REPORTED__ACTION__ACTION_FACE_WAKE_AND_UNLOCK,

            UIACTION_LATENCY_REPORTED__ACTION__ACTION_START_RECENTS_ANIMATION,

            UIACTION_LATENCY_REPORTED__ACTION__ACTION_ROTATE_SCREEN_CAMERA_CHECK,

            UIACTION_LATENCY_REPORTED__ACTION__ACTION_ROTATE_SCREEN_SENSOR,

            UIACTION_LATENCY_REPORTED__ACTION__ACTION_LOCKSCREEN_UNLOCK,

            UIACTION_LATENCY_REPORTED__ACTION__ACTION_USER_SWITCH,

            UIACTION_LATENCY_REPORTED__ACTION__ACTION_SWITCH_DISPLAY_UNFOLD,

            UIACTION_LATENCY_REPORTED__ACTION__ACTION_UDFPS_ILLUMINATE,

            UIACTION_LATENCY_REPORTED__ACTION__ACTION_SHOW_BACK_ARROW,

            UIACTION_LATENCY_REPORTED__ACTION__ACTION_LOAD_SHARE_SHEET,

            UIACTION_LATENCY_REPORTED__ACTION__ACTION_SHOW_SELECTION_TOOLBAR,

            UIACTION_LATENCY_REPORTED__ACTION__ACTION_FOLD_TO_AOD,

    };



    private static LatencyTracker sLatencyTracker;
@@ -269,43 +300,45 @@ public class LatencyTracker { 
    public static String getNameOfAction(int atomsProtoAction) {

        // Defined in AtomsProto.java

        switch (atomsProtoAction) {

            case 0:

            case UIACTION_LATENCY_REPORTED__ACTION__UNKNOWN_ACTION:

                return "UNKNOWN";

            case 1:

            case UIACTION_LATENCY_REPORTED__ACTION__ACTION_EXPAND_PANEL:

                return "ACTION_EXPAND_PANEL";

            case 2:

            case UIACTION_LATENCY_REPORTED__ACTION__ACTION_TOGGLE_RECENTS:

                return "ACTION_TOGGLE_RECENTS";

            case 3:

            case UIACTION_LATENCY_REPORTED__ACTION__ACTION_FINGERPRINT_WAKE_AND_UNLOCK:

                return "ACTION_FINGERPRINT_WAKE_AND_UNLOCK";

            case 4:

            case UIACTION_LATENCY_REPORTED__ACTION__ACTION_CHECK_CREDENTIAL:

                return "ACTION_CHECK_CREDENTIAL";

            case 5:

            case UIACTION_LATENCY_REPORTED__ACTION__ACTION_CHECK_CREDENTIAL_UNLOCKED:

                return "ACTION_CHECK_CREDENTIAL_UNLOCKED";

            case 6:

            case UIACTION_LATENCY_REPORTED__ACTION__ACTION_TURN_ON_SCREEN:

                return "ACTION_TURN_ON_SCREEN";

            case 7:

            case UIACTION_LATENCY_REPORTED__ACTION__ACTION_ROTATE_SCREEN:

                return "ACTION_ROTATE_SCREEN";

            case 8:

            case UIACTION_LATENCY_REPORTED__ACTION__ACTION_FACE_WAKE_AND_UNLOCK:

                return "ACTION_FACE_WAKE_AND_UNLOCK";

            case 9:

            case UIACTION_LATENCY_REPORTED__ACTION__ACTION_START_RECENTS_ANIMATION:

                return "ACTION_START_RECENTS_ANIMATION";

            case 10:

            case UIACTION_LATENCY_REPORTED__ACTION__ACTION_ROTATE_SCREEN_CAMERA_CHECK:

                return "ACTION_ROTATE_SCREEN_CAMERA_CHECK";

            case 11:

            case UIACTION_LATENCY_REPORTED__ACTION__ACTION_ROTATE_SCREEN_SENSOR:

                return "ACTION_ROTATE_SCREEN_SENSOR";

            case 12:

            case UIACTION_LATENCY_REPORTED__ACTION__ACTION_LOCKSCREEN_UNLOCK:

                return "ACTION_LOCKSCREEN_UNLOCK";

            case 13:

            case UIACTION_LATENCY_REPORTED__ACTION__ACTION_USER_SWITCH:

                return "ACTION_USER_SWITCH";

            case 14:

            case UIACTION_LATENCY_REPORTED__ACTION__ACTION_SWITCH_DISPLAY_UNFOLD:

                return "ACTION_SWITCH_DISPLAY_UNFOLD";

            case 15:

            case UIACTION_LATENCY_REPORTED__ACTION__ACTION_UDFPS_ILLUMINATE:

                return "ACTION_UDFPS_ILLUMINATE";

            case 16:

            case UIACTION_LATENCY_REPORTED__ACTION__ACTION_SHOW_BACK_ARROW:

                return "ACTION_SHOW_BACK_ARROW";

            case 17:

            case UIACTION_LATENCY_REPORTED__ACTION__ACTION_LOAD_SHARE_SHEET:

                return "ACTION_LOAD_SHARE_SHEET";

            case 19:

            case UIACTION_LATENCY_REPORTED__ACTION__ACTION_SHOW_SELECTION_TOOLBAR:

                return "ACTION_SHOW_SELECTION_TOOLBAR";

            case UIACTION_LATENCY_REPORTED__ACTION__ACTION_FOLD_TO_AOD:

                return "ACTION_FOLD_TO_AOD";

            default:

                throw new IllegalArgumentException("Invalid action");