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

Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev

Browse Source
This commit is contained in:
Rob Carr
2017-06-22 22:08:03 +00:00
committed by Android (Google) Code Review
parent 9f3967fee1 c1fdd2aa32
commit 82b41e460c
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/widget/ListPopupWindow.java
View File

@@ -25,6 +25,7 @@ import android.content.res.TypedArray;
import android.database.DataSetObserver; import android.database.DataSetObserver;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Handler; import android.os.Handler;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log; import android.util.Log;
@@ -532,8 +533,14 @@ public class ListPopupWindow implements ShowableListMenu {
public void setHeight(int height) { public void setHeight(int height) {
if (height < 0 && ViewGroup.LayoutParams.WRAP_CONTENT != height if (height < 0 && ViewGroup.LayoutParams.WRAP_CONTENT != height
&& ViewGroup.LayoutParams.MATCH_PARENT != height) { && ViewGroup.LayoutParams.MATCH_PARENT != height) {
throw new IllegalArgumentException( if (mContext.getApplicationInfo().targetSdkVersion
"Invalid height. Must be a positive value, MATCH_PARENT, or WRAP_CONTENT."); < Build.VERSION_CODES.O) {
Log.e(TAG, "Negative value " + height + " passed to ListPopupWindow#setHeight"
+ " produces undefined results");
} else {
throw new IllegalArgumentException(
"Invalid height. Must be a positive value, MATCH_PARENT, or WRAP_CONTENT.");
}
} }
mDropDownHeight = height; mDropDownHeight = height;
} }