Skip to content

WMShell: fix instanceof-pattern syntax protologtool can't parse #5

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
deepsidhu1313 wants to merge 2 commits into
base: lineage-21.0
Choose a base branch
from
Open

WMShell: fix instanceof-pattern syntax protologtool can't parse #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72823fa
WMShell: avoid instanceof-pattern syntax protologtool can't parse
Sep 7, 2026
d8849fd
WMShell: fix remaining instanceof-pattern occurrences in BubbleStackView
Sep 7, 2026
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
12 changes: 9 additions & 3 deletions libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,11 @@ public void setValue(Object o, float v) {
@Override
public void onStuckToTarget(@NonNull MagnetizedObject.MagneticTarget target,
@NonNull MagnetizedObject draggedObject) {
if (draggedObject.getUnderlyingObject() instanceof View view) {
// Plain instanceof + cast, not instanceof-pattern -- protologtool's
// bundled Java source parser (scans this whole module for ProtoLog
// calls) doesn't support Java 16 instanceof pattern variables.
if (draggedObject.getUnderlyingObject() instanceof View) {
View view = (View) draggedObject.getUnderlyingObject();
animateDismissBubble(view, true);
}
}
Expand All @@ -459,7 +463,8 @@ public void onStuckToTarget(@NonNull MagnetizedObject.MagneticTarget target,
public void onUnstuckFromTarget(@NonNull MagnetizedObject.MagneticTarget target,
@NonNull MagnetizedObject draggedObject,
float velX, float velY, boolean wasFlungOut) {
if (draggedObject.getUnderlyingObject() instanceof View view) {
if (draggedObject.getUnderlyingObject() instanceof View) {
View view = (View) draggedObject.getUnderlyingObject();
animateDismissBubble(view, false);

if (wasFlungOut) {
Expand All @@ -474,7 +479,8 @@ public void onUnstuckFromTarget(@NonNull MagnetizedObject.MagneticTarget target,
@Override
public void onReleasedInTarget(@NonNull MagnetizedObject.MagneticTarget target,
@NonNull MagnetizedObject<?> draggedObject) {
if (draggedObject.getUnderlyingObject() instanceof View view) {
if (draggedObject.getUnderlyingObject() instanceof View) {
View view = (View) draggedObject.getUnderlyingObject();
mExpandedAnimationController.dismissDraggedOutBubble(
view /* bubble */,
mDismissView.getHeight() /* translationYBy */,
Expand Down