summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2021-05-13 19:44:55 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-05-13 19:44:55 +0000
commit05ba318dfc587d6b06228d92bf6db6d18f96fc8d (patch)
treef723ed5c18ddd8ee38a4ccc7e60e9c8783f1d1ab
parentc9a8383c2204a21ee5d9bb7b4a2d6f2462b23322 (diff)
parent9853e8a94e45ce82b0295d54afd6b199cd619e48 (diff)
Merge "Remove a use of String16::remove." am: 0529640cc0 am: c881ac71b5 am: 9853e8a94e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704170 Change-Id: I31b89ce8b8504388deab49d9af7410f8d64b78fd
-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;
}