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

Merge "AccessibilityNodeInfo shouldn\'t touch extras." into nyc-dev

Browse Source 
am: af64f63

* commit 'af64f6341bdbca93aff3d68264af48e74faa9e58':
  AccessibilityNodeInfo shouldn't touch extras.

Change-Id: I44ae8aebdbe0046a64971eb47c25b8720f7bfd36
This commit is contained in:
Jeff Sharkey
2016-03-30 00:22:00 +00:00
committed by android-build-merger
parent 4fc34416fb af64f6341b
commit 21b1b0d937
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2926,8 +2926,10 @@ public class AccessibilityNodeInfo implements Parcelable {
mInputType = other.mInputType;
mLiveRegion = other.mLiveRegion;
mDrawingOrderInParent = other.mDrawingOrderInParent;
if (other.mExtras != null && !other.mExtras.isEmpty()) {
getExtras().putAll(other.mExtras);
if (other.mExtras != null) {
mExtras = new Bundle(other.mExtras);
} else {
mExtras = null;
}
mRangeInfo = (other.mRangeInfo != null)
? RangeInfo.obtain(other.mRangeInfo) : null;
@@ -3006,7 +3008,9 @@ public class AccessibilityNodeInfo implements Parcelable {
mDrawingOrderInParent = parcel.readInt();
if (parcel.readInt() == 1) {
getExtras().putAll(parcel.readBundle());
mExtras = parcel.readBundle();
} else {
mExtras = null;
}
if (parcel.readInt() == 1) {
@@ -3073,9 +3077,7 @@ public class AccessibilityNodeInfo implements Parcelable {
mTextSelectionEnd = UNDEFINED_SELECTION_INDEX;
mInputType = InputType.TYPE_NULL;
mLiveRegion = View.ACCESSIBILITY_LIVE_REGION_NONE;
if (mExtras != null) {
mExtras.clear();
}
mExtras = null;
if (mRangeInfo != null) {
mRangeInfo.recycle();
mRangeInfo = null;