Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abd86f8f authored by Tri Vo's avatar Tri Vo
Browse files

trusty: Export ConfirmationUI helper classes 

And fix namespaces.

Bug: 174402999
Test: m
Change-Id: I54dcc92d8c153d0fa2b10b2679a9a871699de8b1
parent cb89889a

trusty/confirmationui/TrustyApp.cpp

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */



#include "TrustyApp.h"

#include "TrustyIpc.h"



#include <BufferAllocator/BufferAllocator.h>

#include <android-base/logging.h>
@@ -27,6 +26,7 @@ 


namespace android {

namespace trusty {

namespace confirmationui {



using ::android::base::unique_fd;
@@ -162,5 +162,6 @@ TrustyApp::~TrustyApp() { 
    LOG(INFO) << "Done shutting down TrustyApp";

}



}  // namespace confirmationui

}  // namespace trusty

}  // namespace android

trusty/confirmationui/TrustyApp.h

+3 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#pragma once



#include "TrustyIpc.h"

#include <TrustyIpc.h>



#include <android-base/logging.h>

#include <android-base/unique_fd.h>
@@ -41,6 +41,7 @@ 


namespace android {

namespace trusty {

namespace confirmationui {



using ::teeui::Message;

using ::teeui::msg2tuple_t;
@@ -148,5 +149,6 @@ class TrustyApp { 
    operator bool() const { return handle_ != kInvalidHandle; }

};



}  // namespace confirmationui

}  // namespace trusty

}  // namespace android

trusty/confirmationui/TrustyConfirmationUI.cpp

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ namespace implementation { 


using namespace secure_input;



using ::android::trusty::TrustyAppError;

using ::android::trusty::confirmationui::TrustyAppError;



using ::teeui::AbortMsg;

using ::teeui::DeliverTestCommandMessage;

trusty/confirmationui/TrustyConfirmationUI.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ using ::android::hardware::hidl_vec; 
using ::android::hardware::Return;

using ::android::hardware::Void;



using ::android::trusty::TrustyApp;

using ::android::trusty::confirmationui::TrustyApp;



class TrustyConfirmationUI : public IConfirmationUI {

  public: