diff --git a/fingerprint/Android.bp b/fingerprint/Android.bp index ef686ae..ac00c4e 100644 --- a/fingerprint/Android.bp +++ b/fingerprint/Android.bp @@ -18,7 +18,5 @@ cc_binary { "android.hardware.biometrics.fingerprint@2.2", "android.hardware.biometrics.fingerprint@2.3", "com.motorola.hardware.biometric.fingerprint@1.0", - "com.motorola.hardware.display.panel@1.0", - "com.motorola.hardware.display.panel@1.1", ], } diff --git a/fingerprint/BiometricsFingerprint.cpp b/fingerprint/BiometricsFingerprint.cpp index 947d9c0..11affbc 100644 --- a/fingerprint/BiometricsFingerprint.cpp +++ b/fingerprint/BiometricsFingerprint.cpp @@ -41,8 +41,6 @@ void BiometricsFingerprint::disableHighBrightFod() { std::lock_guard lock(mSetHbmFodMutex); if(!hbmFodEnabled) return; - // this is no mistake, setColor sets the PanelMode, while setMode sets the panel color - displayPanelService->setColor((PanelColor) PanelMode::PANEL_MODE_NORMAL); mMotoFingerprint->sendFodEvent(NOTIFY_FINGER_UP, {}, [](IMotFodEventResult, const hidl_vec&) {}); @@ -53,8 +51,6 @@ void BiometricsFingerprint::enableHighBrightFod() { std::lock_guard lock(mSetHbmFodMutex); if(hbmFodEnabled) return; - // this is no mistake, setColor sets the PanelMode, while setMode sets the panel color - displayPanelService->setColor((PanelColor) PanelMode::PANEL_MODE_HIGH_BRIGHT_FOD); mMotoFingerprint->sendFodEvent(NOTIFY_FINGER_DOWN, {}, [](IMotFodEventResult, const hidl_vec&) {}); @@ -64,7 +60,6 @@ void BiometricsFingerprint::enableHighBrightFod() { BiometricsFingerprint::BiometricsFingerprint() { biometrics_2_1_service = IBiometricsFingerprint_2_1::getService(); mMotoFingerprint = IMotoFingerPrint::getService(); - displayPanelService = IDisplayPanel::getService(); hbmFodEnabled = false; } diff --git a/fingerprint/BiometricsFingerprint.h b/fingerprint/BiometricsFingerprint.h index 55ade69..0d05225 100644 --- a/fingerprint/BiometricsFingerprint.h +++ b/fingerprint/BiometricsFingerprint.h @@ -21,7 +21,6 @@ #include #include #include -#include namespace android { namespace hardware { @@ -44,10 +43,6 @@ using ::com::motorola::hardware::biometric::fingerprint::V1_0::IMotoFingerPrint; using ::com::motorola::hardware::biometric::fingerprint::V1_0::IMotFodEventType; using ::com::motorola::hardware::biometric::fingerprint::V1_0::IMotFodEventResult; -using ::com::motorola::hardware::display::panel::V1_1::IDisplayPanel; -using ::com::motorola::hardware::display::panel::V1_0::PanelColor; -using ::com::motorola::hardware::display::panel::V1_0::PanelMode; - struct BiometricsFingerprint : public IBiometricsFingerprint { BiometricsFingerprint(); // Methods from ::V2_1::IBiometricsFingerprint follow. @@ -76,7 +71,6 @@ private: sp biometrics_2_1_service; sp mMotoFingerprint; - sp displayPanelService; }; } // namespace implementation