summaryrefslogtreecommitdiff
path: root/confirmationui
diff options
context:
space:
mode:
authorJanis Danisevskis <jdanis@google.com>2018-04-26 16:19:46 -0700
committerJanis Danisevskis <jdanis@google.com>2018-04-26 16:27:12 -0700
commit0051181ac707d5d00156c96994d0acdab25e81eb (patch)
tree90950be55fc8258c224d4e83b1400705ac62425d /confirmationui
parentba2fa43da68831960ffe6e29e362bd82750c8f60 (diff)
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
Diffstat (limited to 'confirmationui')
-rw-r--r--confirmationui/support/include/android/hardware/confirmationui/support/confirmationui_utils.h3
1 files changed, 2 insertions, 1 deletions
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<ValueT>::init()), null_(true) {}
- NullOr(ValueT&& value) : value_(std::forward<ValueT>(value)), null_(false) {}
+ template <typename T>
+ NullOr(T&& value) : value_(std::forward<T>(value)), null_(false) {}
bool isOk() const { return !null_; }