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

am d3972f39: am d0699fa5: Merge "Avoid strict mode violation during saveAttributeData" into mnc-dev

Browse Source 
* commit 'd3972f39b862252f3aee443f0fdc23e9ac4882cf':
  Avoid strict mode violation during saveAttributeData
This commit is contained in:
Alan Viverette
2015-05-27 20:40:38 +00:00
committed by Android Git Automerger
parent 41964750d3 d3972f39b8
commit 08064a63dc
2 changed files with 62 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/java/android/content/res/TypedArray.java
View File

@@ -181,7 +181,26 @@ public class TypedArray {
* not be coerced to a string.
* @throws RuntimeException if the TypedArray has already been recycled.
*/
@Nullable
public String getString(int index) {
return getString(index, true);
}
/**
* Returns a string representation of the value at the given index,
* optionally throwing a resource mismatch strict mode violation if the
* value must be coerced to a string.
*
* @param index the index of the attribute to retrieve
* @param strict {@code true} to throw a strict mode violation for string
* coercion, {@code false} otherwise
* @return a string representation of the value at the given index, or
* {@code null} if the resource could not be coerced to a string
* @see StrictMode#noteResourceMismatch(Object)
* @hide Used internally for view attribute inspection.
*/
@Nullable
public String getString(int index, boolean strict) {
if (mRecycled) {
throw new RuntimeException("Cannot make calls to a recycled instance!");
}
@@ -197,7 +216,9 @@ public class TypedArray {
final TypedValue v = mValue;
if (getValueAt(index, v)) {
StrictMode.noteResourceMismatch(v);
if (strict) {
StrictMode.noteResourceMismatch(v);
}
final CharSequence cs = v.coerceToString();
return cs != null ? cs.toString() : null;
}

67
core/java/android/view/View.java
View File

@@ -4457,47 +4457,60 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
private static SparseArray<String> getAttributeMap() {
if (mAttributeMap == null) {
mAttributeMap = new SparseArray<String>();
mAttributeMap = new SparseArray<>();
}
return mAttributeMap;
}
private void saveAttributeData(AttributeSet attrs, TypedArray a) {
int length = ((attrs == null ? 0 : attrs.getAttributeCount()) + a.getIndexCount()) * 2;
mAttributes = new String[length];
private void saveAttributeData(@Nullable AttributeSet attrs, @NonNull TypedArray t) {
final int attrsCount = attrs == null ? 0 : attrs.getAttributeCount();
final int indexCount = t.getIndexCount();
final String[] attributes = new String[(attrsCount + indexCount) * 2];
int i = 0;
if (attrs != null) {
for (i = 0; i < attrs.getAttributeCount(); i += 2) {
mAttributes[i] = attrs.getAttributeName(i);
mAttributes[i + 1] = attrs.getAttributeValue(i);
}
// Store raw XML attributes.
for (int j = 0; j < attrsCount; ++j) {
attributes[i] = attrs.getAttributeName(j);
attributes[i + 1] = attrs.getAttributeValue(j);
i += 2;
}
SparseArray<String> attributeMap = getAttributeMap();
for (int j = 0; j < a.length(); ++j) {
if (a.hasValue(j)) {
// Store resolved styleable attributes.
final Resources res = t.getResources();
final SparseArray<String> attributeMap = getAttributeMap();
for (int j = 0; j < indexCount; ++j) {
final int index = t.getIndex(j);
if (!t.hasValueOrEmpty(index)) {
// Value is undefined. Skip it.
continue;
}
final int resourceId = t.getResourceId(index, 0);
if (resourceId == 0) {
// Value is not a reference. Skip it.
continue;
}
String resourceName = attributeMap.get(resourceId);
if (resourceName == null) {
try {
int resourceId = a.getResourceId(j, 0);
if (resourceId == 0) {
continue;
}
String resourceName = attributeMap.get(resourceId);
if (resourceName == null) {
resourceName = a.getResources().getResourceName(resourceId);
attributeMap.put(resourceId, resourceName);
}
mAttributes[i] = resourceName;
mAttributes[i + 1] = a.getText(j).toString();
i += 2;
resourceName = res.getResourceName(resourceId);
} catch (Resources.NotFoundException e) {
// if we can't get the resource name, we just ignore it
resourceName = "0x" + Integer.toHexString(resourceId);
}
attributeMap.put(resourceId, resourceName);
}
attributes[i] = resourceName;
attributes[i + 1] = t.getString(index, false);
i += 2;
}
// Trim to fit contents.
final String[] trimmed = new String[i];
System.arraycopy(attributes, 0, trimmed, 0, i);
mAttributes = trimmed;
}
public String toString() {