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

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

Browse Source
This commit is contained in:
Alan Viverette
2015-05-14 20:20:47 +00:00
committed by Android (Google) Code Review
parent f061653202 c921f27694
commit f93d16bc70
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/view/accessibility/AccessibilityNodeInfo.java
View File

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