PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Improve reliability of cleanup done in onDestroy."" into main

Browse Source
This commit is contained in:
Shamali Patwa
2025-03-24 13:06:27 -07:00
committed by Android (Google) Code Review
parent 0599eaa522 cfcb27aa9d
commit bb04b1135f
1 changed files with 11 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+11 -35
View File
@@ -86,7 +86,6 @@ import android.os.Trace;
import android.os.UserHandle;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.Log;
import android.view.Display;
import android.view.HapticFeedbackConstants;
import android.view.KeyEvent;
@@ -225,7 +224,6 @@ import java.util.stream.Stream;
public class QuickstepLauncher extends Launcher implements RecentsViewContainer,
SystemShortcut.BubbleActivityStarter {
private static final String TAG = "QuickstepLauncher";
private static final boolean TRACE_LAYOUTS =
SystemProperties.getBoolean("persist.debug.trace_layouts", false);
private static final String TRACE_RELAYOUT_CLASS =
@@ -562,35 +560,20 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer,
@Override
public void onDestroy() {
// wrap non-trivial clean up blocks in try-catch to avoid stopping clean up of rest of
// objects
if (mAppTransitionManager != null) {
try {
mAppTransitionManager.onActivityDestroyed();
} catch (Exception e) {
Log.e(TAG, "Failed to destroy mAppTransitionManager", e);
}
mAppTransitionManager.onActivityDestroyed();
}
mAppTransitionManager = null;
mIsPredictiveBackToHomeInProgress = false;
if (mUnfoldTransitionProgressProvider != null) {
try {
SystemUiProxy.INSTANCE.get(this).setUnfoldAnimationListener(null);
mUnfoldTransitionProgressProvider.destroy();
} catch (Exception e) {
Log.e(TAG, "Failed to destroy mUnfoldTransitionProgressProvider", e);
}
SystemUiProxy.INSTANCE.get(this).setUnfoldAnimationListener(null);
mUnfoldTransitionProgressProvider.destroy();
}
OverviewComponentObserver.INSTANCE.get(this)
.removeOverviewChangeListener(mOverviewChangeListener);
try {
mTISBindHelper.onDestroy();
} catch (Exception e) {
Log.e(TAG, "Failed to destroy mTISBindHelper", e);
}
mTISBindHelper.onDestroy();
if (mLauncherUnfoldAnimationController != null) {
mLauncherUnfoldAnimationController.onDestroy();
@@ -600,22 +583,15 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer,
mSplitSelectStateController.onDestroy();
}
try {
RecentsView recentsView = getOverviewPanel();
if (recentsView != null) {
recentsView.destroy();
}
} catch (Exception e) {
Log.e(TAG, "Failed to destroy RecentsView", e);
RecentsView recentsView = getOverviewPanel();
if (recentsView != null) {
recentsView.destroy();
}
try {
super.onDestroy();
} finally { // trivial close operations in finally.
mHotseatPredictionController.destroy();
if (mViewCapture != null) mViewCapture.close();
removeBackAnimationCallback(mSplitSelectStateController.getSplitBackHandler());
}
super.onDestroy();
mHotseatPredictionController.destroy();
if (mViewCapture != null) mViewCapture.close();
removeBackAnimationCallback(mSplitSelectStateController.getSplitBackHandler());
}
@Override