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

Merge "Add timeout for setPermissionGrantState" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-10 16:32:44 +00:00
committed by Android (Google) Code Review
parent 503b489384 fa5fb1f661
commit 3baa0b34e3
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -16,6 +16,8 @@
package android.app.admin; package android.app.admin;
import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage;
import android.Manifest.permission; import android.Manifest.permission;
import android.annotation.CallbackExecutor; import android.annotation.CallbackExecutor;
import android.annotation.ColorInt; import android.annotation.ColorInt;
@@ -88,6 +90,7 @@ import android.util.Log;
import com.android.internal.R; import com.android.internal.R;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.os.BackgroundThread;
import com.android.internal.util.Preconditions; import com.android.internal.util.Preconditions;
import com.android.org.conscrypt.TrustedCertificateStore; import com.android.org.conscrypt.TrustedCertificateStore;
@@ -8810,6 +8813,11 @@ public class DevicePolicyManager {
mService.setPermissionGrantState(admin, mContext.getPackageName(), packageName, mService.setPermissionGrantState(admin, mContext.getPackageName(), packageName,
permission, grantState, new RemoteCallback((b) -> result.complete(b != null))); permission, grantState, new RemoteCallback((b) -> result.complete(b != null)));
// Timeout
BackgroundThread.getHandler().sendMessageDelayed(
obtainMessage(CompletableFuture::complete, result, false),
20_000);
return result.get(); return result.get();
} catch (RemoteException re) { } catch (RemoteException re) {
throw re.rethrowFromSystemServer(); throw re.rethrowFromSystemServer();