From 90853251f3c468a5e526724e437808f98d8d00b3 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Thu, 27 Apr 2017 17:38:13 -0700 Subject: [PATCH] Only sublist array by size or limit, whichever is smaller. Bug: 37756537 Test: Set < 3 actions, ensure no crash... Change-Id: I93a5ac78292fcdd870ebd897441c2cef0774d134 --- core/java/android/app/PictureInPictureParams.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/app/PictureInPictureParams.java b/core/java/android/app/PictureInPictureParams.java index 875d592722678..e1df33b552818 100644 --- 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)); } }