Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a race condition that causes BackAnimation to be null." into tm-dev am: 9feb8c3ba2

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17047561

Change-Id: I137415fe6c7c73b202c30016eb43ebb5c3f12ed8
This commit is contained in:
Shan Huang
2022-03-01 21:58:24 +00:00
committed by Automerger Merge Worker
parent d9ff4a008b 9feb8c3ba2
commit f5ad5d60ff
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
View File

@@ -936,6 +936,9 @@ public class EdgeBackGestureHandler extends CurrentUserTracker
public void setBackAnimation(BackAnimation backAnimation) { public void setBackAnimation(BackAnimation backAnimation) {
mBackAnimation = backAnimation; mBackAnimation = backAnimation;
if (mEdgeBackPlugin != null && mEdgeBackPlugin instanceof NavigationBarEdgePanel) {
((NavigationBarEdgePanel) mEdgeBackPlugin).setBackAnimation(backAnimation);
}
} }
/** /**

6
packages/SystemUI/src/com/android/systemui/navigationbar/gestural/NavigationBarEdgePanel.java
View File

@@ -280,7 +280,7 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl
} }
}; };
private BackCallback mBackCallback; private BackCallback mBackCallback;
private final BackAnimation mBackAnimation; private BackAnimation mBackAnimation;
public NavigationBarEdgePanel(Context context, public NavigationBarEdgePanel(Context context,
BackAnimation backAnimation) { BackAnimation backAnimation) {
@@ -385,6 +385,10 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl
mShowProtection = !isPrimaryDisplay; mShowProtection = !isPrimaryDisplay;
} }
public void setBackAnimation(BackAnimation backAnimation) {
mBackAnimation = backAnimation;
}
@Override @Override
public void onDestroy() { public void onDestroy() {
cancelFailsafe(); cancelFailsafe();