aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-02 08:56:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add error handling to prevent IllegalArgumentException

Browse Source 
ActivityLaunchAnimator.Controller.fromView requires an instance of LaunchableView, however findViewWithBackground had no checks to return one. updated the check to make the exception less likely.

Flag: not needed
Fixes: 297564681
Test: ran launcher and launched apps
Change-Id: Iddbe55c1ff66b067f8456d058cbc60a2a698c4ae
Merged-In: Iddbe55c1ff66b067f8456d058cbc60a2a698c4ae
This commit is contained in:
Schneider Victor-tulias
2023-08-31 14:27:33 -04:00
parent b043c7ced0
commit 785a7511b6
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
View File

@@ -151,6 +151,7 @@ import com.android.quickstep.views.FloatingWidgetView;
import com.android.quickstep.views.RecentsView;
import com.android.systemui.animation.ActivityLaunchAnimator;
import com.android.systemui.animation.DelegateLaunchAnimatorController;
import com.android.systemui.animation.LaunchableView;
import com.android.systemui.animation.RemoteAnimationDelegate;
import com.android.systemui.shared.system.BlurUtils;
import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
@@ -1799,7 +1800,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
@Nullable
private static ContainerAnimationRunner from(
View v, StartingWindowListener startingWindowListener, RunnableList onEndCallback) {
View viewToUse = findViewWithBackground(v);
View viewToUse = findLaunchableViewWithBackground(v);
if (viewToUse == null) {
viewToUse = v;
}
@@ -1837,11 +1838,15 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
new ActivityLaunchAnimator.AnimationDelegate(controller, callback, listener));
}
/** Finds the closest parent of [view] (inclusive) with a background drawable. */
/**
* Finds the closest parent of [view] (inclusive) that implements {@link LaunchableView} and
* has a background drawable.
*/
@Nullable
private static View findViewWithBackground(View view) {
private static <T extends View & LaunchableView> T findLaunchableViewWithBackground(
View view) {
View current = view;
while (current.getBackground() == null) {
while (current.getBackground() == null || !(current instanceof LaunchableView)) {
if (!(current.getParent() instanceof View)) {
return null;
}
@@ -1849,7 +1854,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
current = (View) view.getParent();
}
return current;
return (T) current;
}
@Override