From 0051181ac707d5d00156c96994d0acdab25e81eb Mon Sep 17 00:00:00 2001 From: Janis Danisevskis Date: Thu, 26 Apr 2018 16:19:46 -0700 Subject: [PATCH] Fix for bug in Fix for wrongly initialized test key With the last patch I exposed the auth token key to users of the GenericOperation. But because the auth token key is never used in the default implementation it did not show that the setHmacKey method did not actually work. This patch fixes it. Bug: 78456249 Test: Compile trusted app based on the GenericOperation Change-Id: I25a80f985ce500e3658421cac62421133cc5b788 --- .../hardware/confirmationui/support/confirmationui_utils.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/confirmationui/support/include/android/hardware/confirmationui/support/confirmationui_utils.h b/confirmationui/support/include/android/hardware/confirmationui/support/confirmationui_utils.h index 3f7810a7e8..a01b5e3c33 100644 --- a/confirmationui/support/include/android/hardware/confirmationui/support/confirmationui_utils.h +++ b/confirmationui/support/include/android/hardware/confirmationui/support/confirmationui_utils.h @@ -58,7 +58,8 @@ class NullOr { public: NullOr() : value_(initializer_t::init()), null_(true) {} - NullOr(ValueT&& value) : value_(std::forward(value)), null_(false) {} + template + NullOr(T&& value) : value_(std::forward(value)), null_(false) {} bool isOk() const { return !null_; }