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

am 71c27899: am e9e7d012: am 272e2f73: Merge "Ensure we don\'t pass null values in to Theme.resolveAttributes" into lmp-mr1-dev

Browse Source 
* commit '71c2789930de7fb1b98ad10ea6a5e6f23500ead2':
  Ensure we don't pass null values in to Theme.resolveAttributes
This commit is contained in:
Alan Viverette
2014-10-31 00:36:28 +00:00
committed by Android Git Automerger
parent 067cbe7f46 71c2789930
commit 613d43473e
5 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/content/res/Resources.java
View File

@@ -18,6 +18,7 @@ package android.content.res;
import android.animation.Animator;
import android.animation.StateListAnimator;
import android.annotation.NonNull;
import android.util.Pools.SynchronizedPool;
import android.view.ViewDebug;
import com.android.internal.util.XmlUtils;
@@ -1548,20 +1549,21 @@ public class Resources {
* contents of the typed array are ultimately filled in by
* {@link Resources#getValue}.
*
* @param values The base set of attribute values, must be equal
* in length to {@code attrs} or {@code null}. All values
* must be of type {@link TypedValue#TYPE_ATTRIBUTE}.
* @param values The base set of attribute values, must be equal in
* length to {@code attrs}. All values must be of type
* {@link TypedValue#TYPE_ATTRIBUTE}.
* @param attrs The desired attributes to be retrieved.
* @return Returns a TypedArray holding an array of the attribute
* values. Be sure to call {@link TypedArray#recycle()}
* when done with it.
* @hide
*/
public TypedArray resolveAttributes(int[] values, int[] attrs) {
@NonNull
public TypedArray resolveAttributes(@NonNull int[] values, @NonNull int[] attrs) {
final int len = attrs.length;
if (values != null && len != values.length) {
if (values == null || len != values.length) {
throw new IllegalArgumentException(
"Base attribute values must be null or the same length as attrs");
"Base attribute values must the same length as attrs");
}
final TypedArray array = TypedArray.obtain(Resources.this, len);