Merge "Only sublist array by size or limit, whichever is smaller." into oc-dev

am: a2f102b175 Change-Id: Iefe4e55a2a048e66ae60c198b3fa4550ff423515
2017-04-28 01:31:58 +00:00
parent 29e4c12dca a2f102b175
commit 0e71996f92
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/app/PictureInPictureParams.java
+++ b/core/java/android/app/PictureInPictureParams.java
@@ -238,7 +238,7 @@ public class PictureInPictureParams implements Parcelable {
     */
    public void truncateActions(int size) {
        if (hasSetActions()) {
-            mUserActions = mUserActions.subList(0, size);
+            mUserActions = mUserActions.subList(0, Math.min(mUserActions.size(), size));
        }
    }