diff options
| author | 2023-05-17 04:16:15 +0000 | |
|---|---|---|
| committer | 2023-05-17 04:16:15 +0000 | |
| commit | 9475ff4ea4cd230945efd3a8151bdfe1fa25dbec (patch) | |
| tree | f3672176b9da318b17f1be56d93d7e8662328876 | |
| parent | 1215978177e551486ec14262d7d4c9de13f9724f (diff) | |
| parent | d092367580e2e13cd25e7d067b6f60e2fd26d8ee (diff) | |
Merge "Fixing test failure on hwasan builds" am: 855810c4e9 am: 6407abc8c9 am: 169df0caa5 am: d092367580
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2592945
Change-Id: Id68902f6cf3a5a1d57d9e1d3b53ee521f2816b35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/binder/tests/binderRecordReplayTest.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/binder/tests/binderRecordReplayTest.cpp b/libs/binder/tests/binderRecordReplayTest.cpp index db7854679f..17d5c8a219 100644 --- a/libs/binder/tests/binderRecordReplayTest.cpp +++ b/libs/binder/tests/binderRecordReplayTest.cpp @@ -234,7 +234,7 @@ TEST_F(BinderRecordReplayTest, ReplayFloatArray) { TEST_F(BinderRecordReplayTest, ReplayLongArray) { std::vector<int64_t> savedArray = {int64_t{1LL << 11}, int64_t{1LL << 55}, int64_t{1LL << 45}}; std::vector<int64_t> changedArray = {int64_t{1LL << 1}, int64_t{1LL << 21}, int64_t{1LL << 33}, - int64_t{1LL << 63}}; + int64_t{1LL << 62}}; recordReplay(&IBinderRecordReplayTest::setLongArray, savedArray, &IBinderRecordReplayTest::getLongArray, changedArray); } @@ -251,7 +251,8 @@ TEST_F(BinderRecordReplayTest, ReplayStringArray) { std::vector<String16> savedArray = {String16("This is saved value"), String16(), String16("\0\0", 2), String16("\xF3\x01\xAC\xAD\x21\xAF")}; - std::vector<String16> changedArray = {String16("This is changed value"), String16("\1\2", 30)}; + std::vector<String16> changedArray = {String16("This is changed value"), + String16("\xF0\x90\x90\xB7\xE2\x82\xAC")}; recordReplay(&IBinderRecordReplayTest::setStringArray, savedArray, &IBinderRecordReplayTest::getStringArray, changedArray); } |