Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Respect timeout multiplier in PermissionControllerManager"

Browse Source
This commit is contained in:
Treehugger Robot
2023-06-21 22:47:54 +00:00
committed by Gerrit Code Review
parent b8d1268ec5 873747c962
commit 8c52e78a19
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/permission/PermissionControllerManager.java
View File

@@ -40,6 +40,7 @@ import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
import android.os.Binder; import android.os.Binder;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Process; import android.os.Process;
@@ -81,8 +82,8 @@ import java.util.function.IntConsumer;
public final class PermissionControllerManager { public final class PermissionControllerManager {
private static final String TAG = PermissionControllerManager.class.getSimpleName(); private static final String TAG = PermissionControllerManager.class.getSimpleName();
private static final long REQUEST_TIMEOUT_MILLIS = 60000; private static final long REQUEST_TIMEOUT_MILLIS = 60000L * Build.HW_TIMEOUT_MULTIPLIER;
private static final long UNBIND_TIMEOUT_MILLIS = 10000; private static final long UNBIND_TIMEOUT_MILLIS = 10000L * Build.HW_TIMEOUT_MULTIPLIER;
private static final int CHUNK_SIZE = 4 * 1024; private static final int CHUNK_SIZE = 4 * 1024;
private static final Object sLock = new Object(); private static final Object sLock = new Object();