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

Merge "Adds expirations for remote callbacks" into sc-dev

Browse Source
This commit is contained in:
Yi Jiang
2021-04-30 20:33:03 +00:00
committed by Android (Google) Code Review
parent bc75177c71 bd4a600225
commit 73d3172e96
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/service/rotationresolver/RotationResolverService.java
View File

@@ -31,6 +31,7 @@ import android.os.IBinder;
import android.os.ICancellationSignal;
import android.os.Looper;
import android.os.RemoteException;
import android.os.SystemClock;
import android.view.Surface;
import java.lang.annotation.Retention;
@@ -136,12 +137,16 @@ public abstract class RotationResolverService extends Service {
@MainThread
private void resolveRotation(IRotationResolverCallback callback,
RotationResolutionRequest request, ICancellationSignal transport) {
// If there is a valid, uncancelled pending callback running in process, the new rotation
// resolution request will be rejected immediately with a failure result.
if (mPendingCallback != null
&& (mCancellationSignal == null || !mCancellationSignal.isCanceled())) {
&& (mCancellationSignal == null || !mCancellationSignal.isCanceled())
&& (SystemClock.uptimeMillis() < mPendingCallback.mExpirationTime)) {
reportFailures(callback, ROTATION_RESULT_FAILURE_PREEMPTED);
return;
}
mPendingCallback = new RotationResolverCallbackWrapper(callback, this);
mPendingCallback = new RotationResolverCallbackWrapper(callback, this,
SystemClock.uptimeMillis() + request.getTimeoutMillis());
mCancellationSignal = CancellationSignal.fromTransport(transport);
onResolveRotation(request, mCancellationSignal, mPendingCallback);
@@ -224,12 +229,15 @@ public abstract class RotationResolverService extends Service {
@NonNull
private final Handler mHandler;
private final long mExpirationTime;
private RotationResolverCallbackWrapper(
@NonNull android.service.rotationresolver.IRotationResolverCallback callback,
RotationResolverService service) {
RotationResolverService service, long expirationTime) {
mCallback = callback;
mService = service;
mHandler = service.mMainThreadHandler;
mExpirationTime = expirationTime;
Objects.requireNonNull(mHandler);
}