Evolution-X-Devices/device_xiaomi_sm8150-common
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sm8150-common: parts: popupcamera: Fixup calibration handling

Browse Source 
* Don't call getMotorStatus() when we already got its result before
* Don't try to take back the motor if popup is jammed at boot
* Catch all exception in updateMotor() thread

Change-Id: I9ca8b9163a0cc8ab17c8f6465c155adf1bb204f2
This commit is contained in:
Sebastiano Barezzi
2022-07-06 21:55:38 +02:00
parent 9b9f6cc449
commit cac09267bc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
parts/src/org/lineageos/settings/popupcamera/PopupCameraService.java
View File

@@ -184,7 +184,6 @@ public class PopupCameraService extends Service implements Handler.Callback {
try {
int status = motor.getMotorStatus();
if (status == Constants.MOTOR_STATUS_POPUP_OK ||
status == Constants.MOTOR_STATUS_POPUP_JAMMED ||
status == Constants.MOTOR_STATUS_TAKEBACK_JAMMED) {
motor.takebackMotor(1);
Thread.sleep(1200);
@@ -268,14 +267,15 @@ public class PopupCameraService extends Service implements Handler.Callback {
if (DEBUG)
Log.d(TAG, "updateMotor: status=" + status);
if (cameraState.equals(Constants.OPEN_CAMERA_STATE) &&
motor.getMotorStatus() == Constants.MOTOR_STATUS_TAKEBACK_OK) {
(status == Constants.MOTOR_STATUS_TAKEBACK_OK ||
status == Constants.MOTOR_STATUS_CALIB_OK)) {
lightUp();
playSoundEffect(Constants.OPEN_CAMERA_STATE);
motor.popupMotor(1);
mSensorManager.registerListener(mFreeFallListener, mFreeFallSensor,
SensorManager.SENSOR_DELAY_NORMAL);
} else if (cameraState.equals(Constants.CLOSE_CAMERA_STATE) &&
motor.getMotorStatus() == Constants.MOTOR_STATUS_POPUP_OK) {
status == Constants.MOTOR_STATUS_POPUP_OK) {
lightUp();
playSoundEffect(Constants.CLOSE_CAMERA_STATE);
motor.takebackMotor(1);
@@ -290,7 +290,7 @@ public class PopupCameraService extends Service implements Handler.Callback {
}
return;
}
} catch (RemoteException e) {
} catch (Exception e) {
// Do nothing
}
mHandler.postDelayed(() -> mMotorBusy = false, 1200);