diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-21 12:33:45 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-21 12:33:45 +0000 |
commit | eb3a3671419ea1e64bfdfc342573a70487f8048a (patch) | |
tree | efd56598481148623e25ea4f4d2c7c5e6517d78e | |
parent | 494c7e9aebef00fae8ec103b21b1c6e1029bb394 (diff) | |
parent | d36a68183cb306c6abc233928689fdfc657e521a (diff) | |
download | core-eb3a3671419ea1e64bfdfc342573a70487f8048a.tar.gz |
Snap for 8626064 from d36a68183cb306c6abc233928689fdfc657e521a to mainline-go-adbd-release
Change-Id: If5a1364e00628000da3c2e877e8d75e10164c2a7
-rw-r--r-- | fs_mgr/libsnapshot/include/libsnapshot/cow_reader.h | 8 | ||||
-rw-r--r-- | libprocessgroup/profiles/task_profiles.json | 17 | ||||
-rw-r--r-- | rootdir/etc/linker.config.json | 4 | ||||
-rw-r--r-- | rootdir/init.rc | 6 | ||||
-rw-r--r-- | trusty/keymaster/keymint/TrustyKeyMintOperation.cpp | 6 |
5 files changed, 18 insertions, 23 deletions
diff --git a/fs_mgr/libsnapshot/include/libsnapshot/cow_reader.h b/fs_mgr/libsnapshot/include/libsnapshot/cow_reader.h index 8e6bbd9b6..f4d5c72f3 100644 --- a/fs_mgr/libsnapshot/include/libsnapshot/cow_reader.h +++ b/fs_mgr/libsnapshot/include/libsnapshot/cow_reader.h @@ -171,11 +171,11 @@ class CowReader final : public ICowReader { std::optional<uint64_t> last_label_; std::shared_ptr<std::vector<CowOperation>> ops_; std::shared_ptr<std::vector<uint32_t>> merge_op_blocks_; - uint64_t merge_op_start_; + uint64_t merge_op_start_{}; std::shared_ptr<std::unordered_map<uint32_t, int>> block_map_; - uint64_t num_total_data_ops_; - uint64_t num_ordered_ops_to_merge_; - bool has_seq_ops_; + uint64_t num_total_data_ops_{}; + uint64_t num_ordered_ops_to_merge_{}; + bool has_seq_ops_{}; std::shared_ptr<std::unordered_map<uint64_t, uint64_t>> data_loc_; ReaderFlags reader_flag_; }; diff --git a/libprocessgroup/profiles/task_profiles.json b/libprocessgroup/profiles/task_profiles.json index f5533c262..4092c1a37 100644 --- a/libprocessgroup/profiles/task_profiles.json +++ b/libprocessgroup/profiles/task_profiles.json @@ -224,19 +224,6 @@ ] }, { - "Name": "VMCompilationPerformance", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "cpu", - "Path": "system" - } - } - ] - }, - { "Name": "CpuPolicySpread", "Actions": [ { @@ -660,6 +647,10 @@ "Profiles": [ "ServicePerformance", "LowIoPriority", "TimerSlackNormal" ] }, { + "Name": "VMCompilationPerformance", + "Profiles": [ "HighPerformance", "ProcessCapacityHigh", "LowIoPriority", "TimerSlackNormal" ] + }, + { "Name": "SCHED_SP_RT_APP", "Profiles": [ "RealtimePerformance", "MaxIoPriority", "TimerSlackNormal" ] }, diff --git a/rootdir/etc/linker.config.json b/rootdir/etc/linker.config.json index 780ace58a..c88c7ff1e 100644 --- a/rootdir/etc/linker.config.json +++ b/rootdir/etc/linker.config.json @@ -31,5 +31,9 @@ "libadb_pairing_auth.so", "libadb_pairing_connection.so", "libadb_pairing_server.so" + ], + "provideLibs": [ + "libaptX_encoder.so", + "libaptXHD_encoder.so" ] } diff --git a/rootdir/init.rc b/rootdir/init.rc index 0bd0e1d80..cd71aa8aa 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -97,22 +97,18 @@ on property:apexd.status=ready && property:ro.product.cpu.abilist64=* exec_start boringssl_self_test_apex64 service boringssl_self_test32 /system/bin/boringssl_self_test32 - setenv BORINGSSL_SELF_TEST_CREATE_FLAG true # Any nonempty value counts as true reboot_on_failure reboot,boringssl-self-check-failed stdio_to_kmsg service boringssl_self_test64 /system/bin/boringssl_self_test64 - setenv BORINGSSL_SELF_TEST_CREATE_FLAG true # Any nonempty value counts as true reboot_on_failure reboot,boringssl-self-check-failed stdio_to_kmsg service boringssl_self_test_apex32 /apex/com.android.conscrypt/bin/boringssl_self_test32 - setenv BORINGSSL_SELF_TEST_CREATE_FLAG true # Any nonempty value counts as true reboot_on_failure reboot,boringssl-self-check-failed stdio_to_kmsg service boringssl_self_test_apex64 /apex/com.android.conscrypt/bin/boringssl_self_test64 - setenv BORINGSSL_SELF_TEST_CREATE_FLAG true # Any nonempty value counts as true reboot_on_failure reboot,boringssl-self-check-failed stdio_to_kmsg @@ -973,7 +969,7 @@ on post-fs-data mkdir /data/media/obb 0770 media_rw media_rw encryption=Attempt # Create directories for boot animation. - mkdir /data/bootanim 0755 system system encryption=None + mkdir /data/bootanim 0755 system system encryption=DeleteIfNecessary exec_start derive_sdk diff --git a/trusty/keymaster/keymint/TrustyKeyMintOperation.cpp b/trusty/keymaster/keymint/TrustyKeyMintOperation.cpp index 9440724da..78e765e9c 100644 --- a/trusty/keymaster/keymint/TrustyKeyMintOperation.cpp +++ b/trusty/keymaster/keymint/TrustyKeyMintOperation.cpp @@ -52,11 +52,15 @@ TrustyKeyMintOperation::~TrustyKeyMintOperation() { } ScopedAStatus TrustyKeyMintOperation::updateAad( - const vector<uint8_t>& input, const optional<HardwareAuthToken>& /* authToken */, + const vector<uint8_t>& input, const optional<HardwareAuthToken>& authToken, const optional<TimeStampToken>& /* timestampToken */) { UpdateOperationRequest request(impl_->message_version()); request.op_handle = opHandle_; request.additional_params.push_back(TAG_ASSOCIATED_DATA, input.data(), input.size()); + if (authToken) { + auto tokenAsVec(authToken2AidlVec(*authToken)); + request.additional_params.push_back(TAG_AUTH_TOKEN, tokenAsVec.data(), tokenAsVec.size()); + } UpdateOperationResponse response(impl_->message_version()); impl_->UpdateOperation(request, &response); |