diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java index 474430eb44ab6..2e8a1d76a9648 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java @@ -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); } } @@ -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) { @@ -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 */,