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

Commit 238ada5d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Respect timeout multiplier in PermissionControllerManager" am: 8c52e78a 

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



Change-Id: Ib1529ed5d6956246e502374318bcd7506ef6b138
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 118c22bb 8c52e78a

core/java/android/permission/PermissionControllerManager.java

+3 −2
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.content.Intent; 
import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.os.Binder;

import android.os.Build;

import android.os.Bundle;

import android.os.Handler;

import android.os.Process;
@@ -81,8 +82,8 @@ import java.util.function.IntConsumer; 
public final class PermissionControllerManager {

    private static final String TAG = PermissionControllerManager.class.getSimpleName();



    private static final long REQUEST_TIMEOUT_MILLIS = 60000;

    private static final long UNBIND_TIMEOUT_MILLIS = 10000;

    private static final long REQUEST_TIMEOUT_MILLIS = 60000L * Build.HW_TIMEOUT_MULTIPLIER;

    private static final long UNBIND_TIMEOUT_MILLIS = 10000L * Build.HW_TIMEOUT_MULTIPLIER;

    private static final int CHUNK_SIZE = 4 * 1024;



    private static final Object sLock = new Object();