commit 895c0334011a1bdf2f95898b8f4d2a7d516b4ec1
author Narayan Kamath <narayan@google.com> Tue Apr 04 09:24:15 2017 +0100
committer gitbuildkicker <android-build@google.com> Wed Apr 05 13:15:33 2017 -0700
tree 4d6db1f75903730eca84b454ad70c03f13c1a554
parent 28e7fabca5b10971ebf280f26905619749988c90

Revert "Revert "Matcher: Avoid excessive String copies.""

This reverts commit 53e4e15bb0fc2f789274998f3ce62c4fc021fbe8.

Fixes a memory leak introduced in 53e4e15bb0f. Also :
- switches to using ScopedStringChars to simplify the code further.
- better ICU error checking.

Bug: 36366255
Bug: 36818684

Test: cts -m CtsLibcoreTestCases
Test: ScannerTest on host/x86

(cherry picked from commit 9084fb6f7c4da5d42c6b58b523d71e8ad65dd754)

Change-Id: Iad7c5b07647542bcaa2e6621107c0cd206249bae
(cherry picked from commit 285e53bf2b7c81134ae8bdb4044df216610bed17)