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

Commit 37374c9b authored by Peter Collingbourne's avatar Peter Collingbourne
Browse files

Add support for a hw_timeout_multiplier system property. 

In order to test the platform in emulators that are orders of magnitude
slower than real hardware we need to be able to avoid hitting timeouts
that prevent it from coming up properly. For this purpose introduce
a system property, ro.hw_timeout_multiplier, which may be set to
an integer value that acts as a multiplier for various timeouts on
the system.

Bug: 178231152
Change-Id: I6d7710beed0c4c5b1720e74e7abe3a586778c678
Ignore-AOSP-First: The frameworks/base part of this change conflicts with AOSP so we need to land it internally first
parent f8cc3c16

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

+3 −2
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.content.Intent; 
import android.content.ServiceConnection;

import android.net.Uri;

import android.os.Binder;

import android.os.Build;

import android.os.Handler;

import android.os.IBinder;

import android.os.Looper;
@@ -77,9 +78,9 @@ public final class JobServiceContext implements ServiceConnection { 


    private static final String TAG = "JobServiceContext";

    /** Amount of time the JobScheduler waits for the initial service launch+bind. */

    private static final long OP_BIND_TIMEOUT_MILLIS = 18 * 1000;

    private static final long OP_BIND_TIMEOUT_MILLIS = 18 * 1000 * Build.HW_TIMEOUT_MULTIPLIER;

    /** Amount of time the JobScheduler will wait for a response from an app for a message. */

    private static final long OP_TIMEOUT_MILLIS = 8 * 1000;

    private static final long OP_TIMEOUT_MILLIS = 8 * 1000 * Build.HW_TIMEOUT_MULTIPLIER;



    private static final String[] VERB_STRINGS = {

            "VERB_BINDING", "VERB_STARTING", "VERB_EXECUTING", "VERB_STOPPING", "VERB_FINISHED"

core/java/android/content/ContentResolver.java

+6 −4
Original line number Diff line number Diff line
@@ -743,7 +743,7 @@ public abstract class ContentResolver implements ContentInterface { 
    // Always log queries which take 500ms+; shorter queries are

    // sampled accordingly.

    private static final boolean ENABLE_CONTENT_SAMPLE = false;

    private static final int SLOW_THRESHOLD_MILLIS = 500;

    private static final int SLOW_THRESHOLD_MILLIS = 500 * Build.HW_TIMEOUT_MULTIPLIER;

    private final Random mRandom = new Random();  // guarded by itself



    /** @hide */
@@ -757,7 +757,8 @@ public abstract class ContentResolver implements ContentInterface { 
     * before we decide it must be hung.

     * @hide

     */

    public static final int CONTENT_PROVIDER_PUBLISH_TIMEOUT_MILLIS = 10 * 1000;

    public static final int CONTENT_PROVIDER_PUBLISH_TIMEOUT_MILLIS =

            10 * 1000 * Build.HW_TIMEOUT_MULTIPLIER;



    /**

     * How long we wait for an provider to be published. Should be longer than
@@ -765,10 +766,11 @@ public abstract class ContentResolver implements ContentInterface { 
     * @hide

     */

    public static final int CONTENT_PROVIDER_READY_TIMEOUT_MILLIS =

            CONTENT_PROVIDER_PUBLISH_TIMEOUT_MILLIS + 10 * 1000;

            CONTENT_PROVIDER_PUBLISH_TIMEOUT_MILLIS + 10 * 1000 * Build.HW_TIMEOUT_MULTIPLIER;



    // Timeout given a ContentProvider that has already been started and connected to.

    private static final int CONTENT_PROVIDER_TIMEOUT_MILLIS = 3 * 1000;

    private static final int CONTENT_PROVIDER_TIMEOUT_MILLIS =

            3 * 1000 * Build.HW_TIMEOUT_MULTIPLIER;



    // Should be >= {@link #CONTENT_PROVIDER_WAIT_TIMEOUT_MILLIS}, because that's how

    // long ActivityManagerService is giving a content provider to get published if a new process

core/java/android/os/Build.java

+12 −0
Original line number Diff line number Diff line
@@ -1116,6 +1116,18 @@ public class Build { 
        }

    }



    /**

     * A multiplier for various timeouts on the system.

     *

     * The intent is that products targeting software emulators that are orders of magnitude slower

     * than real hardware may set this to a large number. On real devices and hardware-accelerated

     * virtualized devices this should not be set.

     *

     * @hide

     */

    public static final int HW_TIMEOUT_MULTIPLIER =

        SystemProperties.getInt("ro.hw_timeout_multiplier", 1);



    /**

     * True if Treble is enabled and required for this device.

     *

core/java/android/os/InputConstants.java

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.os;



/** @hide */

public class InputConstants {

    public static final int DEFAULT_DISPATCHING_TIMEOUT_MILLIS =

            IInputConstants.UNMULTIPLIED_DEFAULT_DISPATCHING_TIMEOUT_MILLIS

            * Build.HW_TIMEOUT_MULTIPLIER;

}

services/core/java/com/android/server/Watchdog.java

+2 −1
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ public class Watchdog { 
    //         can trigger the watchdog.

    // Note 2: The debug value is already below the wait time in ZygoteConnection. Wrapped

    //         applications may not work with a debug build. CTS will fail.

    private static final long DEFAULT_TIMEOUT = DB ? 10 * 1000 : 60 * 1000;

    private static final long DEFAULT_TIMEOUT =

            (DB ? 10 * 1000 : 60 * 1000) * Build.HW_TIMEOUT_MULTIPLIER;

    private static final long CHECK_INTERVAL = DEFAULT_TIMEOUT / 2;



    // These are temporally ordered: larger values as lateness increases