Adopt changes in secure_fb interface.
Bug: 175731623
Change-Id: I83ac1d7a004ddc8c0528540be0569454f7ee5bf0
diff --git a/examples/layouts/rules.mk b/examples/layouts/rules.mk
index b4120ab..7851ae2 100644
--- a/examples/layouts/rules.mk
+++ b/examples/layouts/rules.mk
@@ -28,9 +28,6 @@
$(LIBTEEUI_ROOT)/include \
$(LOCAL_DIR)/include \
-MODULE_CPPFLAGS := -std=c++17 -fno-short-enums -fno-exceptions
-MODULE_CPPFLAGS += -fno-threadsafe-statics -fno-rtti -DNDEBUG
-
MODULE_COMPILEFLAGS := -U__ANDROID__
# The assembler need the search path set to this directory so that the incbin directive finds
diff --git a/rules.mk b/rules.mk
index b86f0b9..e2ad59f 100644
--- a/rules.mk
+++ b/rules.mk
@@ -21,7 +21,6 @@
# Use the default layouts unless we have a vendor specific layout defined.
CONFIRMATIONUI_LAYOUTS ?= $(LOCAL_DIR)/examples/layouts
CONFIRMATIONUI_DEVICE_PARAMS ?= $(LOCAL_DIR)/examples/devices/emulator
-TRUSTY_SECURE_FB ?= trusty/user/base/lib/secure_fb/mock
MODULE_SRCS += \
$(LOCAL_DIR)/src/main.cpp \
@@ -30,19 +29,15 @@
$(LOCAL_DIR)/src/trusty_confirmation_ui.cpp \
$(LOCAL_DIR)/src/trusty_time_stamper.cpp \
-MODULE_CPPFLAGS := -std=c++17 -fno-short-enums -fno-exceptions
-MODULE_CPPFLAGS += -fno-threadsafe-statics -fno-rtti
-
MODULE_DEPS += \
trusty/user/base/lib/libc-trusty \
trusty/user/base/lib/libstdc++-trusty \
trusty/user/base/lib/rng \
+ trusty/user/base/lib/secure_fb \
trusty/user/base/lib/teeui-stub \
trusty/user/base/lib/tipc \
external/boringssl \
- $(TRUSTY_SECURE_FB) \
$(CONFIRMATIONUI_DEVICE_PARAMS) \
$(CONFIRMATIONUI_LAYOUTS) \
include make/module.mk
-
diff --git a/src/trusty_confirmation_ui.cpp b/src/trusty_confirmation_ui.cpp
index 2110dac..0174650 100644
--- a/src/trusty_confirmation_ui.cpp
+++ b/src/trusty_confirmation_ui.cpp
@@ -14,26 +14,21 @@
* limitations under the License.
*/
+#define TLOG_TAG "confirmationui"
+
#include "trusty_confirmation_ui.h"
+#include "trusty_operation.h"
#include <devices/device_parameters.h>
+#include <interface/secure_fb/secure_fb.h>
+#include <inttypes.h>
#include <layouts/layout.h>
-
+#include <stdio.h>
#include <teeui/error.h>
#include <teeui/localization/ConfirmationUITranslations.h>
#include <teeui/utils.h>
-
-#include <interface/secure_fb/secure_fb.h>
-
-#include "trusty_operation.h"
-
-#include <inttypes.h>
-#include <stdio.h>
-
#include <trusty_log.h>
-#define TLOG_TAG "confirmationui"
-
using teeui::ResponseCode;
static constexpr const teeui::Color kColorEnabled = 0xff212121;
@@ -151,9 +146,8 @@
bool magnified) {
enabled_ = true;
inverted_ = inverted;
- auto rc = trusty_secure_fb_get_secure_fb(&fb_info_);
- if (rc != TTUI_ERROR_OK) {
- TLOGE("trusty_secure_fb_get_secure_fb returned %d\n", rc);
+ if (auto rc = secure_fb_open(&secure_fb_handle_, &fb_info_)) {
+ TLOGE("secure_fb_open returned %d\n", rc);
return ResponseCode::UIError;
}
if (fb_info_.pixel_format != TTUI_PF_RGBA8) {
@@ -231,9 +225,8 @@
return teeuiError2ResponseCode(error);
}
- auto rc = trusty_secure_fb_display_next(&fb_info_, false);
- if (rc != TTUI_ERROR_OK) {
- TLOGE("trusty_secure_fb_display_next returned %d\n", rc);
+ if (auto rc = secure_fb_display_next(secure_fb_handle_, &fb_info_)) {
+ TLOGE("secure_fb_display_next returned %d\n", rc);
return ResponseCode::UIError;
}
@@ -271,6 +264,7 @@
void TrustyConfirmationUI::stop() {
TLOGI("calling gui stop\n");
- trusty_secure_fb_release_display();
+ secure_fb_close(secure_fb_handle_);
+ secure_fb_handle_ = NULL;
TLOGI("calling gui stop - done\n");
}
diff --git a/src/trusty_confirmation_ui.h b/src/trusty_confirmation_ui.h
index dd308b4..12609c1 100644
--- a/src/trusty_confirmation_ui.h
+++ b/src/trusty_confirmation_ui.h
@@ -24,7 +24,7 @@
#include <teeui/error.h>
#include <teeui/utils.h>
-#include <interface/secure_fb/secure_fb.h>
+#include <lib/secure_fb/secure_fb.h>
#include <secure_input/secure_input_proto.h>
@@ -78,7 +78,8 @@
teeui::Error updateTranslations();
teeui::ResponseCode renderAndSwap();
- trusty_secure_fb_info fb_info_;
+ secure_fb_info fb_info_;
+ secure_fb_handle_t secure_fb_handle_;
uint32_t rotation_;
bool inverted_;
