Update adapter with aidl movement
diff --git a/adapter/BiometricsFace.h b/adapter/BiometricsFace.h
index f8fdaf0..4fc6ffc 100644
--- a/adapter/BiometricsFace.h
+++ b/adapter/BiometricsFace.h
@@ -21,9 +21,9 @@
#include <hidl/Status.h>
#include <random>
-#include <com/android/internal/libremobileos/faceunlock/IFaceHalService.h>
-#include <com/android/internal/libremobileos/faceunlock/IFaceHalServiceCallback.h>
-#include <com/android/internal/libremobileos/faceunlock/BnFaceHalServiceCallback.h>
+#include <com/libremobileos/faceunlock/client/IFaceHalService.h>
+#include <com/libremobileos/faceunlock/client/IFaceHalServiceCallback.h>
+#include <com/libremobileos/faceunlock/client/BnFaceHalServiceCallback.h>
namespace android::hardware::biometrics::face::implementation {
@@ -38,9 +38,9 @@
using ::android::hardware::biometrics::face::V1_0::IBiometricsFaceClientCallback;
using ::android::hardware::biometrics::face::V1_0::Status;
-using ::com::android::internal::libremobileos::faceunlock::BnFaceHalServiceCallback;
-using ::com::android::internal::libremobileos::faceunlock::IFaceHalService;
-using ::com::android::internal::libremobileos::faceunlock::IFaceHalServiceCallback;
+using ::com::libremobileos::faceunlock::client::BnFaceHalServiceCallback;
+using ::com::libremobileos::faceunlock::client::IFaceHalService;
+using ::com::libremobileos::faceunlock::client::IFaceHalServiceCallback;
class BiometricsFace : public V1_0::IBiometricsFace {
public:
diff --git a/adapter/FaceHalServiceCallback.cpp b/adapter/FaceHalServiceCallback.cpp
index 980251c..d1d6142 100644
--- a/adapter/FaceHalServiceCallback.cpp
+++ b/adapter/FaceHalServiceCallback.cpp
@@ -23,7 +23,7 @@
FaceHalServiceCallback::FaceHalServiceCallback(sp<IBiometricsFaceClientCallback> biometricsFaceClientCallback) : mBiometricsFaceClientCallback(biometricsFaceClientCallback) {}
-// Methods from ::com::android::internal::libremobileos::faceunlock::IFaceHalServiceCallback follow.
+// Methods from ::com::libremobileos::faceunlock::client::IFaceHalServiceCallback follow.
::android::binder::Status FaceHalServiceCallback::onEnrollResult(int64_t deviceId, int32_t faceId, int32_t userId, int32_t remaining) {
mBiometricsFaceClientCallback->onEnrollResult(deviceId, faceId, userId, remaining);
return ::android::binder::Status::ok();
diff --git a/adapter/FaceHalServiceCallback.h b/adapter/FaceHalServiceCallback.h
index 809bd4d..8db0200 100644
--- a/adapter/FaceHalServiceCallback.h
+++ b/adapter/FaceHalServiceCallback.h
@@ -24,7 +24,7 @@
public:
FaceHalServiceCallback(sp<IBiometricsFaceClientCallback>);
- // Methods from ::com::android::internal::libremobileos::faceunlock::IFaceHalServiceCallback follow.
+ // Methods from ::com::libremobileos::faceunlock::client::IFaceHalServiceCallback follow.
::android::binder::Status onEnrollResult(int64_t deviceId, int32_t faceId, int32_t userId, int32_t remaining) override;
::android::binder::Status onAuthenticated(int64_t deviceId, int32_t faceId, int32_t userId, const ::std::vector<uint8_t> &token) override;
diff --git a/adapter/binder-interfaces/IFaceHalService.cpp b/adapter/binder-interfaces/IFaceHalService.cpp
index 0b266d5..e672760 100644
--- a/adapter/binder-interfaces/IFaceHalService.cpp
+++ b/adapter/binder-interfaces/IFaceHalService.cpp
@@ -1,42 +1,36 @@
-#include <com/android/internal/libremobileos/faceunlock/IFaceHalService.h>
-#include <com/android/internal/libremobileos/faceunlock/BpFaceHalService.h>
+#include <com/libremobileos/faceunlock/client/IFaceHalService.h>
+#include <com/libremobileos/faceunlock/client/BpFaceHalService.h>
namespace com {
-namespace android {
-
-namespace internal {
-
namespace libremobileos {
namespace faceunlock {
-DO_NOT_DIRECTLY_USE_ME_IMPLEMENT_META_INTERFACE(FaceHalService, "com.android.internal.libremobileos.faceunlock.IFaceHalService")
+namespace client {
+
+DO_NOT_DIRECTLY_USE_ME_IMPLEMENT_META_INTERFACE(FaceHalService, "com.libremobileos.faceunlock.client.IFaceHalService")
+
+} // namespace client
} // namespace faceunlock
} // namespace libremobileos
-} // namespace internal
-
-} // namespace android
-
} // namespace com
-#include <com/android/internal/libremobileos/faceunlock/BpFaceHalService.h>
-#include <com/android/internal/libremobileos/faceunlock/BnFaceHalService.h>
+#include <com/libremobileos/faceunlock/client/BpFaceHalService.h>
+#include <com/libremobileos/faceunlock/client/BnFaceHalService.h>
#include <binder/Parcel.h>
#include <android-base/macros.h>
namespace com {
-namespace android {
-
-namespace internal {
-
namespace libremobileos {
namespace faceunlock {
+namespace client {
+
BpFaceHalService::BpFaceHalService(const ::android::sp<::android::IBinder>& _aidl_impl)
: BpInterface<IFaceHalService>(_aidl_impl){
}
@@ -74,7 +68,7 @@
return _aidl_status;
}
-::android::binder::Status BpFaceHalService::setCallback(const ::android::sp<::com::android::internal::libremobileos::faceunlock::IFaceHalServiceCallback>& callback) {
+::android::binder::Status BpFaceHalService::setCallback(const ::android::sp<::com::libremobileos::faceunlock::client::IFaceHalServiceCallback>& callback) {
::android::Parcel _aidl_data;
_aidl_data.markForBinder(remoteStrong());
::android::Parcel _aidl_reply;
@@ -84,7 +78,7 @@
if (((_aidl_ret_status) != (::android::OK))) {
goto _aidl_error;
}
- _aidl_ret_status = _aidl_data.writeStrongBinder(::com::android::internal::libremobileos::faceunlock::IFaceHalServiceCallback::asBinder(callback));
+ _aidl_ret_status = _aidl_data.writeStrongBinder(::com::libremobileos::faceunlock::client::IFaceHalServiceCallback::asBinder(callback));
if (((_aidl_ret_status) != (::android::OK))) {
goto _aidl_error;
}
@@ -589,29 +583,25 @@
return _aidl_status;
}
+} // namespace client
+
} // namespace faceunlock
} // namespace libremobileos
-} // namespace internal
-
-} // namespace android
-
} // namespace com
-#include <com/android/internal/libremobileos/faceunlock/BnFaceHalService.h>
+#include <com/libremobileos/faceunlock/client/BnFaceHalService.h>
#include <binder/Parcel.h>
#include <binder/Stability.h>
namespace com {
-namespace android {
-
-namespace internal {
-
namespace libremobileos {
namespace faceunlock {
+namespace client {
+
BnFaceHalService::BnFaceHalService()
{
::android::internal::Stability::markCompilationUnit(this);
@@ -643,7 +633,7 @@
break;
case BnFaceHalService::TRANSACTION_setCallback:
{
- ::android::sp<::com::android::internal::libremobileos::faceunlock::IFaceHalServiceCallback> in_callback;
+ ::android::sp<::com::libremobileos::faceunlock::client::IFaceHalServiceCallback> in_callback;
if (!(_aidl_data.checkInterface(this))) {
_aidl_ret_status = ::android::BAD_TYPE;
break;
@@ -1015,12 +1005,10 @@
return _aidl_ret_status;
}
+} // namespace client
+
} // namespace faceunlock
} // namespace libremobileos
-} // namespace internal
-
-} // namespace android
-
} // namespace com
diff --git a/adapter/binder-interfaces/IFaceHalServiceCallback.cpp b/adapter/binder-interfaces/IFaceHalServiceCallback.cpp
index e915aba..5de5f1c 100644
--- a/adapter/binder-interfaces/IFaceHalServiceCallback.cpp
+++ b/adapter/binder-interfaces/IFaceHalServiceCallback.cpp
@@ -1,42 +1,36 @@
-#include <com/android/internal/libremobileos/faceunlock/IFaceHalServiceCallback.h>
-#include <com/android/internal/libremobileos/faceunlock/BpFaceHalServiceCallback.h>
+#include <com/libremobileos/faceunlock/client/IFaceHalServiceCallback.h>
+#include <com/libremobileos/faceunlock/client/BpFaceHalServiceCallback.h>
namespace com {
-namespace android {
-
-namespace internal {
-
namespace libremobileos {
namespace faceunlock {
-DO_NOT_DIRECTLY_USE_ME_IMPLEMENT_META_INTERFACE(FaceHalServiceCallback, "com.android.internal.libremobileos.faceunlock.IFaceHalServiceCallback")
+namespace client {
+
+DO_NOT_DIRECTLY_USE_ME_IMPLEMENT_META_INTERFACE(FaceHalServiceCallback, "com.libremobileos.faceunlock.client.IFaceHalServiceCallback")
+
+} // namespace client
} // namespace faceunlock
} // namespace libremobileos
-} // namespace internal
-
-} // namespace android
-
} // namespace com
-#include <com/android/internal/libremobileos/faceunlock/BpFaceHalServiceCallback.h>
-#include <com/android/internal/libremobileos/faceunlock/BnFaceHalServiceCallback.h>
+#include <com/libremobileos/faceunlock/client/BpFaceHalServiceCallback.h>
+#include <com/libremobileos/faceunlock/client/BnFaceHalServiceCallback.h>
#include <binder/Parcel.h>
#include <android-base/macros.h>
namespace com {
-namespace android {
-
-namespace internal {
-
namespace libremobileos {
namespace faceunlock {
+namespace client {
+
BpFaceHalServiceCallback::BpFaceHalServiceCallback(const ::android::sp<::android::IBinder>& _aidl_impl)
: BpInterface<IFaceHalServiceCallback>(_aidl_impl){
}
@@ -287,29 +281,25 @@
return _aidl_status;
}
+} // namespace client
+
} // namespace faceunlock
} // namespace libremobileos
-} // namespace internal
-
-} // namespace android
-
} // namespace com
-#include <com/android/internal/libremobileos/faceunlock/BnFaceHalServiceCallback.h>
+#include <com/libremobileos/faceunlock/client/BnFaceHalServiceCallback.h>
#include <binder/Parcel.h>
#include <binder/Stability.h>
namespace com {
-namespace android {
-
-namespace internal {
-
namespace libremobileos {
namespace faceunlock {
+namespace client {
+
BnFaceHalServiceCallback::BnFaceHalServiceCallback()
{
::android::internal::Stability::markCompilationUnit(this);
@@ -508,12 +498,10 @@
return _aidl_ret_status;
}
+} // namespace client
+
} // namespace faceunlock
} // namespace libremobileos
-} // namespace internal
-
-} // namespace android
-
} // namespace com
diff --git a/adapter/binder-interfaces/include/com/android/internal/libremobileos/faceunlock/BnFaceHalService.h b/adapter/binder-interfaces/include/com/libremobileos/faceunlock/client/BnFaceHalService.h
similarity index 92%
rename from adapter/binder-interfaces/include/com/android/internal/libremobileos/faceunlock/BnFaceHalService.h
rename to adapter/binder-interfaces/include/com/libremobileos/faceunlock/client/BnFaceHalService.h
index eb3d9c1..6845397 100644
--- a/adapter/binder-interfaces/include/com/android/internal/libremobileos/faceunlock/BnFaceHalService.h
+++ b/adapter/binder-interfaces/include/com/libremobileos/faceunlock/client/BnFaceHalService.h
@@ -1,18 +1,16 @@
#pragma once
#include <binder/IInterface.h>
-#include <com/android/internal/libremobileos/faceunlock/IFaceHalService.h>
+#include <com/libremobileos/faceunlock/client/IFaceHalService.h>
namespace com {
-namespace android {
-
-namespace internal {
-
namespace libremobileos {
namespace faceunlock {
+namespace client {
+
class BnFaceHalService : public ::android::BnInterface<IFaceHalService> {
public:
static constexpr uint32_t TRANSACTION_getDeviceId = ::android::IBinder::FIRST_CALL_TRANSACTION + 0;
@@ -34,12 +32,10 @@
::android::status_t onTransact(uint32_t _aidl_code, const ::android::Parcel& _aidl_data, ::android::Parcel* _aidl_reply, uint32_t _aidl_flags) override;
}; // class BnFaceHalService
+} // namespace client
+
} // namespace faceunlock
} // namespace libremobileos
-} // namespace internal
-
-} // namespace android
-
} // namespace com
diff --git a/adapter/binder-interfaces/include/com/android/internal/libremobileos/faceunlock/BnFaceHalServiceCallback.h b/adapter/binder-interfaces/include/com/libremobileos/faceunlock/client/BnFaceHalServiceCallback.h
similarity index 87%
rename from adapter/binder-interfaces/include/com/android/internal/libremobileos/faceunlock/BnFaceHalServiceCallback.h
rename to adapter/binder-interfaces/include/com/libremobileos/faceunlock/client/BnFaceHalServiceCallback.h
index 701abc9..aa3be49 100644
--- a/adapter/binder-interfaces/include/com/android/internal/libremobileos/faceunlock/BnFaceHalServiceCallback.h
+++ b/adapter/binder-interfaces/include/com/libremobileos/faceunlock/client/BnFaceHalServiceCallback.h
@@ -1,18 +1,16 @@
#pragma once
#include <binder/IInterface.h>
-#include <com/android/internal/libremobileos/faceunlock/IFaceHalServiceCallback.h>
+#include <com/libremobileos/faceunlock/client/IFaceHalServiceCallback.h>
namespace com {
-namespace android {
-
-namespace internal {
-
namespace libremobileos {
namespace faceunlock {
+namespace client {
+
class BnFaceHalServiceCallback : public ::android::BnInterface<IFaceHalServiceCallback> {
public:
static constexpr uint32_t TRANSACTION_onEnrollResult = ::android::IBinder::FIRST_CALL_TRANSACTION + 0;
@@ -26,12 +24,10 @@
::android::status_t onTransact(uint32_t _aidl_code, const ::android::Parcel& _aidl_data, ::android::Parcel* _aidl_reply, uint32_t _aidl_flags) override;
}; // class BnFaceHalServiceCallback
+} // namespace client
+
} // namespace faceunlock
} // namespace libremobileos
-} // namespace internal
-
-} // namespace android
-
} // namespace com
diff --git a/adapter/binder-interfaces/include/com/android/internal/libremobileos/faceunlock/BpFaceHalService.h b/adapter/binder-interfaces/include/com/libremobileos/faceunlock/client/BpFaceHalService.h
similarity index 87%
rename from adapter/binder-interfaces/include/com/android/internal/libremobileos/faceunlock/BpFaceHalService.h
rename to adapter/binder-interfaces/include/com/libremobileos/faceunlock/client/BpFaceHalService.h
index 5fad204..f21a52d 100644
--- a/adapter/binder-interfaces/include/com/android/internal/libremobileos/faceunlock/BpFaceHalService.h
+++ b/adapter/binder-interfaces/include/com/libremobileos/faceunlock/client/BpFaceHalService.h
@@ -3,24 +3,22 @@
#include <binder/IBinder.h>
#include <binder/IInterface.h>
#include <utils/Errors.h>
-#include <com/android/internal/libremobileos/faceunlock/IFaceHalService.h>
+#include <com/libremobileos/faceunlock/client/IFaceHalService.h>
namespace com {
-namespace android {
-
-namespace internal {
-
namespace libremobileos {
namespace faceunlock {
+namespace client {
+
class BpFaceHalService : public ::android::BpInterface<IFaceHalService> {
public:
explicit BpFaceHalService(const ::android::sp<::android::IBinder>& _aidl_impl);
virtual ~BpFaceHalService() = default;
::android::binder::Status getDeviceId(int64_t* _aidl_return) override;
- ::android::binder::Status setCallback(const ::android::sp<::com::android::internal::libremobileos::faceunlock::IFaceHalServiceCallback>& callback) override;
+ ::android::binder::Status setCallback(const ::android::sp<::com::libremobileos::faceunlock::client::IFaceHalServiceCallback>& callback) override;
::android::binder::Status setActiveUser(int32_t userId, const ::android::String16& storePath, int32_t* _aidl_return) override;
::android::binder::Status generateChallenge(int32_t timeout, int64_t* _aidl_return) override;
::android::binder::Status enroll(const ::std::vector<uint8_t>& token, int32_t timeout, const ::std::vector<int32_t>& disabledFeatures, int32_t* _aidl_return) override;
@@ -36,12 +34,10 @@
::android::binder::Status resetLockout(const ::std::vector<uint8_t>& token, int32_t* _aidl_return) override;
}; // class BpFaceHalService
+} // namespace client
+
} // namespace faceunlock
} // namespace libremobileos
-} // namespace internal
-
-} // namespace android
-
} // namespace com
diff --git a/adapter/binder-interfaces/include/com/android/internal/libremobileos/faceunlock/BpFaceHalServiceCallback.h b/adapter/binder-interfaces/include/com/libremobileos/faceunlock/client/BpFaceHalServiceCallback.h
similarity index 88%
rename from adapter/binder-interfaces/include/com/android/internal/libremobileos/faceunlock/BpFaceHalServiceCallback.h
rename to adapter/binder-interfaces/include/com/libremobileos/faceunlock/client/BpFaceHalServiceCallback.h
index 8006129..4cfa324 100644
--- a/adapter/binder-interfaces/include/com/android/internal/libremobileos/faceunlock/BpFaceHalServiceCallback.h
+++ b/adapter/binder-interfaces/include/com/libremobileos/faceunlock/client/BpFaceHalServiceCallback.h
@@ -3,18 +3,16 @@
#include <binder/IBinder.h>
#include <binder/IInterface.h>
#include <utils/Errors.h>
-#include <com/android/internal/libremobileos/faceunlock/IFaceHalServiceCallback.h>
+#include <com/libremobileos/faceunlock/client/IFaceHalServiceCallback.h>
namespace com {
-namespace android {
-
-namespace internal {
-
namespace libremobileos {
namespace faceunlock {
+namespace client {
+
class BpFaceHalServiceCallback : public ::android::BpInterface<IFaceHalServiceCallback> {
public:
explicit BpFaceHalServiceCallback(const ::android::sp<::android::IBinder>& _aidl_impl);
@@ -28,12 +26,10 @@
::android::binder::Status onLockoutChanged(int64_t duration) override;
}; // class BpFaceHalServiceCallback
+} // namespace client
+
} // namespace faceunlock
} // namespace libremobileos
-} // namespace internal
-
-} // namespace android
-
} // namespace com
diff --git a/adapter/binder-interfaces/include/com/android/internal/libremobileos/faceunlock/IFaceHalService.h b/adapter/binder-interfaces/include/com/libremobileos/faceunlock/client/IFaceHalService.h
similarity index 92%
rename from adapter/binder-interfaces/include/com/android/internal/libremobileos/faceunlock/IFaceHalService.h
rename to adapter/binder-interfaces/include/com/libremobileos/faceunlock/client/IFaceHalService.h
index c636cbb..3905045 100644
--- a/adapter/binder-interfaces/include/com/android/internal/libremobileos/faceunlock/IFaceHalService.h
+++ b/adapter/binder-interfaces/include/com/libremobileos/faceunlock/client/IFaceHalService.h
@@ -3,7 +3,7 @@
#include <binder/IBinder.h>
#include <binder/IInterface.h>
#include <binder/Status.h>
-#include <com/android/internal/libremobileos/faceunlock/IFaceHalServiceCallback.h>
+#include <com/libremobileos/faceunlock/client/IFaceHalServiceCallback.h>
#include <cstdint>
#include <utils/String16.h>
#include <utils/StrongPointer.h>
@@ -11,19 +11,17 @@
namespace com {
-namespace android {
-
-namespace internal {
-
namespace libremobileos {
namespace faceunlock {
+namespace client {
+
class IFaceHalService : public ::android::IInterface {
public:
DECLARE_META_INTERFACE(FaceHalService)
virtual ::android::binder::Status getDeviceId(int64_t* _aidl_return) = 0;
- virtual ::android::binder::Status setCallback(const ::android::sp<::com::android::internal::libremobileos::faceunlock::IFaceHalServiceCallback>& callback) = 0;
+ virtual ::android::binder::Status setCallback(const ::android::sp<::com::libremobileos::faceunlock::client::IFaceHalServiceCallback>& callback) = 0;
virtual ::android::binder::Status setActiveUser(int32_t userId, const ::android::String16& storePath, int32_t* _aidl_return) = 0;
virtual ::android::binder::Status generateChallenge(int32_t timeout, int64_t* _aidl_return) = 0;
virtual ::android::binder::Status enroll(const ::std::vector<uint8_t>& token, int32_t timeout, const ::std::vector<int32_t>& disabledFeatures, int32_t* _aidl_return) = 0;
@@ -47,7 +45,7 @@
::android::binder::Status getDeviceId(int64_t*) override {
return ::android::binder::Status::fromStatusT(::android::UNKNOWN_TRANSACTION);
}
- ::android::binder::Status setCallback(const ::android::sp<::com::android::internal::libremobileos::faceunlock::IFaceHalServiceCallback>&) override {
+ ::android::binder::Status setCallback(const ::android::sp<::com::libremobileos::faceunlock::client::IFaceHalServiceCallback>&) override {
return ::android::binder::Status::fromStatusT(::android::UNKNOWN_TRANSACTION);
}
::android::binder::Status setActiveUser(int32_t, const ::android::String16&, int32_t*) override {
@@ -91,12 +89,10 @@
}
}; // class IFaceHalServiceDefault
+} // namespace client
+
} // namespace faceunlock
} // namespace libremobileos
-} // namespace internal
-
-} // namespace android
-
} // namespace com
diff --git a/adapter/binder-interfaces/include/com/android/internal/libremobileos/faceunlock/IFaceHalServiceCallback.h b/adapter/binder-interfaces/include/com/libremobileos/faceunlock/client/IFaceHalServiceCallback.h
similarity index 96%
rename from adapter/binder-interfaces/include/com/android/internal/libremobileos/faceunlock/IFaceHalServiceCallback.h
rename to adapter/binder-interfaces/include/com/libremobileos/faceunlock/client/IFaceHalServiceCallback.h
index ab34e59..544a5fd 100644
--- a/adapter/binder-interfaces/include/com/android/internal/libremobileos/faceunlock/IFaceHalServiceCallback.h
+++ b/adapter/binder-interfaces/include/com/libremobileos/faceunlock/client/IFaceHalServiceCallback.h
@@ -9,14 +9,12 @@
namespace com {
-namespace android {
-
-namespace internal {
-
namespace libremobileos {
namespace faceunlock {
+namespace client {
+
class IFaceHalServiceCallback : public ::android::IInterface {
public:
DECLARE_META_INTERFACE(FaceHalServiceCallback)
@@ -57,12 +55,10 @@
}
}; // class IFaceHalServiceCallbackDefault
+} // namespace client
+
} // namespace faceunlock
} // namespace libremobileos
-} // namespace internal
-
-} // namespace android
-
} // namespace com
diff --git a/adapter/service.cpp b/adapter/service.cpp
index aff1920..1e6705d 100644
--- a/adapter/service.cpp
+++ b/adapter/service.cpp
@@ -32,7 +32,7 @@
using android::hardware::joinRpcThreadpool;
using android::hardware::biometrics::face::implementation::BiometricsFace;
using android::hardware::biometrics::face::V1_0::IBiometricsFace;
-using ::com::android::internal::libremobileos::faceunlock::IFaceHalService;
+using ::com::libremobileos::faceunlock::client::IFaceHalService;
int main() {
sp<IBinder> binderFaceHal;