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

Revert "Break strong ref to ExpandableNotificationRow"

Browse Source 
This reverts commit a9593e965d.

Reason for revert: Causing NPE, see b/144701184.

Bug: 144109427
Fixes: 144701184
Change-Id: Icb6f95f73219944b905822cbfa1f0c6460b3d628
This commit is contained in:
Robert Snoeberger
2019-11-18 19:39:09 +00:00
parent a9593e965d
commit d54a3c7c71
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/SystemUI/src/com/android/systemui/statusbar/notification/ActivityLaunchAnimator.java
View File

@@ -125,21 +125,22 @@ public class ActivityLaunchAnimator {
return mAnimationRunning;
}
private class AnimationRunner extends IRemoteAnimationRunner.Stub {
class AnimationRunner extends IRemoteAnimationRunner.Stub {
private ExpandableNotificationRow mSourceNotification;
private final ExpandAnimationParameters mParams = new ExpandAnimationParameters();
private final ExpandableNotificationRow mSourceNotification;
private final ExpandAnimationParameters mParams;
private final Rect mWindowCrop = new Rect();
private final float mNotificationCornerRadius;
private float mCornerRadius;
private boolean mIsFullScreenLaunch = true;
private final SyncRtSurfaceTransactionApplier mSyncRtTransactionApplier;
AnimationRunner(ExpandableNotificationRow sourceNotification) {
mSourceNotification = sourceNotification;
mSyncRtTransactionApplier = new SyncRtSurfaceTransactionApplier(sourceNotification);
mNotificationCornerRadius = Math.max(sourceNotification.getCurrentTopRoundness(),
sourceNotification.getCurrentBottomRoundness());
public AnimationRunner(ExpandableNotificationRow sourceNofitication) {
mSourceNotification = sourceNofitication;
mParams = new ExpandAnimationParameters();
mSyncRtTransactionApplier = new SyncRtSurfaceTransactionApplier(mSourceNotification);
mNotificationCornerRadius = Math.max(mSourceNotification.getCurrentTopRoundness(),
mSourceNotification.getCurrentBottomRoundness());
}
@Override
@@ -154,7 +155,6 @@ public class ActivityLaunchAnimator {
setAnimationPending(false);
invokeCallback(iRemoteAnimationFinishedCallback);
mNotificationPanel.collapse(false /* delayed */, 1.0f /* speedUpFactor */);
mSourceNotification = null;
return;
}
@@ -254,7 +254,6 @@ public class ActivityLaunchAnimator {
mCallback.onExpandAnimationFinished(mIsFullScreenLaunch);
applyParamsToNotification(null);
applyParamsToNotificationList(null);
mSourceNotification = null;
}
}
@@ -282,7 +281,6 @@ public class ActivityLaunchAnimator {
mSourceNotification.post(() -> {
setAnimationPending(false);
mCallback.onLaunchAnimationCancelled();
mSourceNotification = null;
});
}
};