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

Merge "Don't yell when calling into SystemUI" into oc-dev

Browse Source
This commit is contained in:
Jorim Jaggi
2017-05-08 12:51:42 +00:00
committed by Android (Google) Code Review
parent a5f08d340d ed410b6928
commit 5286b96576
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
services/core/java/com/android/server/wm/AppTransition.java
View File

@@ -54,6 +54,7 @@ import android.content.res.Configuration;
import android.graphics.Bitmap;
import android.graphics.Path;
import android.graphics.Rect;
import android.os.Binder;
import android.os.Debug;
import android.os.IBinder;
import android.os.IRemoteCallback;
@@ -1808,27 +1809,25 @@ public class AppTransition implements Dump {
final IAppTransitionAnimationSpecsFuture future
= mNextAppTransitionAnimationsSpecsFuture;
mNextAppTransitionAnimationsSpecsFuture = null;
mDefaultExecutor.execute(new Runnable() {
@Override
public void run() {
AppTransitionAnimationSpec[] specs = null;
try {
specs = future.get();
} catch (RemoteException e) {
Slog.w(TAG, "Failed to fetch app transition specs: " + e);
}
synchronized (mService.mWindowMap) {
mNextAppTransitionAnimationsSpecsPending = false;
overridePendingAppTransitionMultiThumb(specs,
mNextAppTransitionFutureCallback, null /* finishedCallback */,
mNextAppTransitionScaleUp);
mNextAppTransitionFutureCallback = null;
if (specs != null) {
mService.prolongAnimationsFromSpecs(specs, mNextAppTransitionScaleUp);
}
}
mService.requestTraversal();
mDefaultExecutor.execute(() -> {
AppTransitionAnimationSpec[] specs = null;
try {
Binder.allowBlocking(future.asBinder());
specs = future.get();
} catch (RemoteException e) {
Slog.w(TAG, "Failed to fetch app transition specs: " + e);
}
synchronized (mService.mWindowMap) {
mNextAppTransitionAnimationsSpecsPending = false;
overridePendingAppTransitionMultiThumb(specs,
mNextAppTransitionFutureCallback, null /* finishedCallback */,
mNextAppTransitionScaleUp);
mNextAppTransitionFutureCallback = null;
if (specs != null) {
mService.prolongAnimationsFromSpecs(specs, mNextAppTransitionScaleUp);
}
}
mService.requestTraversal();
});
}
}