summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2021-05-13 19:34:16 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-05-13 19:34:16 +0000
commit9853e8a94e45ce82b0295d54afd6b199cd619e48 (patch)
treef1b8aebdbeb3e32b44a0dc4b8601582a85ecfd17
parentef339664dd6762bf1ae9ae247fdd478599a57fd0 (diff)
parentc881ac71b59376305f81c1cb2552c817bf5fc053 (diff)
Merge "Remove a use of String16::remove." am: 0529640cc0 am: c881ac71b5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704170 Change-Id: I6817cbc45faabde688d59f4cd36260cea231a1c5
-rw-r--r--tools/aapt/pseudolocalize.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/aapt/pseudolocalize.cpp b/tools/aapt/pseudolocalize.cpp
index 5c47e0fa8a16..4e8dcb1bc6ee 100644
--- a/tools/aapt/pseudolocalize.cpp
+++ b/tools/aapt/pseudolocalize.cpp
@@ -194,7 +194,8 @@ static String16 pseudo_generate_expansion(const unsigned int length) {
break;
}
}
- result.remove(length + ext, 0);
+ // Just keep the first length + ext characters
+ result = String16(result, length + ext);
}
return result;
}