Check for String.offset < API 23 #350
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jrodbx
changed the title
| import static org.junit.Assert.fail; | ||
|
|
||
| public class HahaHelperTest { | ||
| public static final int STRING_CLASS_ID = 100; |
|
LGTM. Once updated with feedback, feel free to merge. |
|
updated per feedback |
|
|
||
| @Override | ||
| public int readInt() { | ||
| if(intsToRead == null || intIndex < 0 || intIndex >= intsToRead.length) { |
There was a problem hiding this comment.
code not properly formatted (missing space after if)
* Added check for offset field in String class for versions < API 23 * Added heap dump for M post-Preview 2 * Added unit test to cover String instance cases
|
updated per feedback |
jrodbx
added a commit
that referenced
this pull request
Jan 2, 2016
Check for String.offset < API 23
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As of M, the int offset and char[] value fields were removed from String.java and could not be parsed in heap dumps.
However, in Preview 2, the char buffer was still serialized in the heap dump, 16 bytes after the String address. This commit restored parsing of M Preview 2 heap dumps.
After Android M Preview 2, a virtual char[] value field was inserted in all String objects when dumping the heap. This resulted in execution of the pre-M code path which expected the "offset" field defined in the original String.java. This commit accounts for the third case.