| commit | 9833cc5b4f0c4e18d5046ad6f0998117bee2eb3a | [log] [tgz] |
|---|---|---|
| author | Janis Danisevskis <jdanis@google.com> | Thu Apr 26 18:29:08 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 26 18:29:08 2018 -0700 |
| tree | dd91648b8f10c88f1cce5a327ab9dde2a845cba4 | |
| parent | 514cad67b9b526ac1a3e5afcda5c3f5a682e8ceb [diff] | |
| parent | 875dcd9082327c9cfe607a310d56cdd193b49613 [diff] |
Fix for bug in Fix for wrongly initialized test key am: 0051181ac7 am: 875dcd9082 Change-Id: I374e6fa5beb07fca53a1191564d4d8175b5a6c8c
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 3f7810a..a01b5e3 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 @@ 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_; }