Skip to content

Fix remote animation delegate validation #1346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pbzin wants to merge 1 commit into
base: 16.0
Choose a base branch
from
Open

Fix remote animation delegate validation #1346

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions services/core/java/com/android/server/wm/WindowOrganizerController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1685,13 +1685,16 @@ private int applyHierarchyOp(WindowContainerTransaction.HierarchyOp hop, int eff
Slog.e(TAG, "No transition to set animation delegate on");
break;
}
// Unfortunately, IApplicationThread.Stub.asInterface will make a random Proxy
// object if the binder isn't the correct interface (instead of returning null),
// so we have to do our own check.
final IBinder binder = hop.getCaller();
android.os.IInterface iin = binder.queryLocalInterface(
IApplicationThread.Stub.DESCRIPTOR);
if (!(iin instanceof IApplicationThread)) {
try {
// queryLocalInterface() always returns null for a valid remote BinderProxy.
// Check the descriptor so both local and cross-process callers are accepted.
if (binder == null || !IApplicationThread.Stub.DESCRIPTOR.equals(
binder.getInterfaceDescriptor())) {
Slog.e(TAG, "Not a valid process token: " + binder);
break;
}
} catch (RemoteException e) {
Slog.e(TAG, "Not a valid process token: " + binder);
break;
}
Expand Down