am f93d16bc: Merge "Avoid sealed check when unparceling AccessibilityNodeInfo" into mnc-dev

* commit 'f93d16bc705027aaca3a9c36788e0c1f26233bd0':
  Avoid sealed check when unparceling AccessibilityNodeInfo
This commit is contained in:
Alan Viverette
2015-05-14 20:29:18 +00:00
committed by Android Git Automerger

View File

@@ -1011,6 +1011,10 @@ public class AccessibilityNodeInfo implements Parcelable {
public void addAction(AccessibilityAction action) {
enforceNotSealed();
addActionUnchecked(action);
}
private void addActionUnchecked(AccessibilityAction action) {
if (action == null) {
return;
}
@@ -2846,9 +2850,9 @@ public class AccessibilityNodeInfo implements Parcelable {
addLegacyStandardActions(legacyStandardActions);
final int nonLegacyActionCount = actionCount - Integer.bitCount(legacyStandardActions);
for (int i = 0; i < nonLegacyActionCount; i++) {
AccessibilityAction action = new AccessibilityAction(
final AccessibilityAction action = new AccessibilityAction(
parcel.readInt(), parcel.readCharSequence());
addAction(action);
addActionUnchecked(action);
}
}