Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fce23748 authored by Winson Chung's avatar Winson Chung
Browse files

Ensuring that we don't try to use and propagate null activity labels. 

- Also fixes issue with tapping outside bounds not working to dismiss recents

Bug: 21774486
Bug: 22241587
Change-Id: Ib50f6fece8fb150929a1f8cdb01b8e8fe7b665cd
parent beb3185f

packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java

+13 −2
Original line number Diff line number Diff line
@@ -343,11 +343,14 @@ public class RecentsTaskLoader { 
        if (infoHandle.info != null) {

            label = ssp.getActivityLabel(infoHandle.info);

            mActivityLabelCache.put(taskKey, label);

            return label;

        } else {

            Log.w(TAG, "Missing ActivityInfo for " + taskKey.baseIntent.getComponent()

                    + " u=" + taskKey.userId);

        }

        return label;

        // If the activity info does not exist or fails to load, return an empty label for now,

        // but do not cache it

        return "";

    }



    /** Returns the content description using as many cached values as we can. */
@@ -358,14 +361,22 @@ public class RecentsTaskLoader { 
        if (label != null) {

            return label;

        }

        // If the given activity label is empty, don't compute or cache the content description

        if (activityLabel.isEmpty()) {

            return "";

        }



        label = ssp.getContentDescription(taskKey.baseIntent, taskKey.userId, activityLabel, res);

        if (label != null) {

            mContentDescriptionCache.put(taskKey, label);

            return label;

        } else {

            Log.w(TAG, "Missing content description for " + taskKey.baseIntent.getComponent()

                    + " u=" + taskKey.userId);

        }

        return label;

        // If the content description does not exist, return an empty label for now, but do not

        // cache it

        return "";

    }



    /** Returns the activity icon using as many cached values as we can. */

packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ class TaskStackViewTouchHandler implements SwipeHelper.Callback { 
                                    overscrollRange);

                    // Invalidate to kick off computeScroll

                    mSv.invalidate();

                } else if (mScroller.isScrollOutOfBounds()) {

                } else if (mIsScrolling && mScroller.isScrollOutOfBounds()) {

                    // Animate the scroll back into bounds

                    mScroller.animateBoundScroll();

                } else if (mActiveTaskView == null) {