From 1f014fd7e3335169721de9daaaf5aad35a88e835 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Mon, 19 Mar 2018 14:19:41 -0700 Subject: [PATCH 1/3] Only check screen pinning state on touch down. Bug: 74997742 Test: Swipe up, check systrace Change-Id: I8b2a0819bc839b2bc76775c99df0840ab889a96e --- .../statusbar/phone/NavigationBarGestureHelper.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java index cd000fe4ba70d..a0df558a44d89 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java @@ -73,6 +73,7 @@ public class NavigationBarGestureHelper implements TunerService.Tunable, Gesture private int mTouchDownY; private boolean mDownOnRecents; private VelocityTracker mVelocityTracker; + private boolean mIsInScreenPinning; private boolean mDockWindowEnabled; private boolean mDockWindowTouchSlopExceeded; @@ -105,6 +106,9 @@ public class NavigationBarGestureHelper implements TunerService.Tunable, Gesture } public boolean onInterceptTouchEvent(MotionEvent event) { + if (event.getActionMasked() == MotionEvent.ACTION_DOWN) { + mIsInScreenPinning = mNavigationBarView.inScreenPinning(); + } if (!canHandleGestures()) { return false; } @@ -269,7 +273,7 @@ public class NavigationBarGestureHelper implements TunerService.Tunable, Gesture } private boolean canHandleGestures() { - return !mNavigationBarView.inScreenPinning() && !mStatusBar.isKeyguardShowing() + return !mIsInScreenPinning && !mStatusBar.isKeyguardShowing() && mStatusBar.isPresenterFullyCollapsed(); } From 475f20f688a1be56632f0d44bb707ba715d08fc2 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Mon, 19 Mar 2018 15:04:56 -0700 Subject: [PATCH 2/3] Don't update onboarding if there is no valid running task. Bug: 75974298 Test: Manual, just a null check Change-Id: I09a9cd435854846c62ea2ef42e8c91e727a81f04 --- .../src/com/android/systemui/recents/RecentsOnboarding.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsOnboarding.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsOnboarding.java index c348187115f0d..75bc955882440 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsOnboarding.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsOnboarding.java @@ -96,6 +96,9 @@ public class RecentsOnboarding { public void onTaskStackChanged() { ActivityManager.RunningTaskInfo info = ActivityManagerWrapper.getInstance() .getRunningTask(ACTIVITY_TYPE_UNDEFINED /* ignoreActivityType */); + if (info == null) { + return; + } if (mBlacklistedPackages.contains(info.baseActivity.getPackageName())) { hide(true); return; From 4a088432b6026735dbe8ebf8f204229496f09f0f Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Mon, 19 Mar 2018 15:08:13 -0700 Subject: [PATCH 3/3] Reset dummy stack view tasks after computing transition into Recents - Also clear up references from the app transition spec future to the parent implementation, which can also leak memory. Bug: 73961798 Test: Enter recents, ensure that dummy stack view holds no task refs Change-Id: I0c466350c1c1dd490f8776ca23f13de0d698e060 --- .../recents/view/AppTransitionAnimationSpecsFuture.java | 4 ++++ .../src/com/android/systemui/recents/RecentsImpl.java | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/view/AppTransitionAnimationSpecsFuture.java b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/view/AppTransitionAnimationSpecsFuture.java index 85d362a7a767e..c227feec75b6c 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/view/AppTransitionAnimationSpecsFuture.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/view/AppTransitionAnimationSpecsFuture.java @@ -49,6 +49,10 @@ public abstract class AppTransitionAnimationSpecsFuture { mHandler.post(mComposeTask); } List specs = mComposeTask.get(); + // Clear reference to the compose task this future holds onto the reference to it's + // implementation (which can leak references to the bitmap it creates for the + // transition) + mComposeTask = null; if (specs == null) { return null; } diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java index ac26f68bacf79..19da3dba17e88 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java @@ -276,6 +276,9 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener } }; + // Used to reset the dummy stack view + private final TaskStack mEmptyTaskStack = new TaskStack(); + public RecentsImpl(Context context) { mContext = context; mHandler = new Handler(); @@ -1108,6 +1111,10 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener } }); EventBus.getDefault().send(hideMenuEvent); + + // Once we have launched the activity, reset the dummy stack view tasks so we don't hold + // onto references to the same tasks consumed by the activity + mDummyStackView.setTasks(mEmptyTaskStack, false /* notifyStackChanges */); } /**** OnAnimationFinishedListener Implementation ****/