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

Commit 2b6862dc authored by Shuzhen Wang's avatar Shuzhen Wang
Browse files

Camera: Propogate deviceError in more scenarios 

When camera device goes into error state, it may not go into IDLE state,
resulting in deviceError being lost. Make sure device error is recorded
in case of close-after-error.

Test: Force a device error and watchdog bite, observe analytics
Bug: 239057315
Change-Id: I7bd26b50f30ce2c22e010d5de9be1ee200d2b144
parent 721d9d7f

services/core/java/com/android/server/camera/CameraServiceProxy.java

+7 −4
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ public class CameraServiceProxy extends SystemService 
        private long mDurationOrStartTimeMs;  // Either start time, or duration once completed



        CameraUsageEvent(String cameraId, int facing, String clientName, int apiLevel,

                boolean isNdk, int action, int latencyMs, int operatingMode) {

                boolean isNdk, int action, int latencyMs, int operatingMode, boolean deviceError) {

            mCameraId = cameraId;

            mCameraFacing = facing;

            mClientName = clientName;
@@ -258,6 +258,7 @@ public class CameraServiceProxy extends SystemService 
            mAction = action;

            mLatencyMs = latencyMs;

            mOperatingMode = operatingMode;

            mDeviceError = deviceError;

        }



        public void markCompleted(int internalReconfigure, long requestCount,
@@ -1108,7 +1109,7 @@ public class CameraServiceProxy extends SystemService 
                    CameraUsageEvent openEvent = new CameraUsageEvent(

                            cameraId, facing, clientName, apiLevel, isNdk,

                            FrameworkStatsLog.CAMERA_ACTION_EVENT__ACTION__OPEN,

                            latencyMs, sessionType);

                            latencyMs, sessionType, deviceError);

                    mCameraUsageHistory.add(openEvent);

                    break;

                case CameraSessionStats.CAMERA_STATE_ACTIVE:
@@ -1135,7 +1136,7 @@ public class CameraServiceProxy extends SystemService 
                    CameraUsageEvent newEvent = new CameraUsageEvent(

                            cameraId, facing, clientName, apiLevel, isNdk,

                            FrameworkStatsLog.CAMERA_ACTION_EVENT__ACTION__SESSION,

                            latencyMs, sessionType);

                            latencyMs, sessionType, deviceError);

                    CameraUsageEvent oldEvent = mActiveCameraUsage.put(cameraId, newEvent);

                    if (oldEvent != null) {

                        Slog.w(TAG, "Camera " + cameraId + " was already marked as active");
@@ -1154,6 +1155,8 @@ public class CameraServiceProxy extends SystemService 
                                resultErrorCount, deviceError, streamStats, userTag,

                                videoStabilizationMode);

                        mCameraUsageHistory.add(doneEvent);

                        // Do not double count device error

                        deviceError = false;



                        // Check current active camera IDs to see if this package is still

                        // talking to some camera
@@ -1177,7 +1180,7 @@ public class CameraServiceProxy extends SystemService 
                        CameraUsageEvent closeEvent = new CameraUsageEvent(

                                cameraId, facing, clientName, apiLevel, isNdk,

                                FrameworkStatsLog.CAMERA_ACTION_EVENT__ACTION__CLOSE,

                                latencyMs, sessionType);

                                latencyMs, sessionType, deviceError);

                        mCameraUsageHistory.add(closeEvent);

                    }