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

Commit a4937159 authored by Evan Severson's avatar Evan Severson Committed by Automerger Merge Worker
Browse files

Merge "Convert ns to ms when averaging light values" into tm-qpr-dev am: e885bd18 am: ac375b6f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20168810



Change-Id: I979ab617ea1e287c748825d0b73b92694f7264e0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d1ff29e2 ac375b6f

services/core/java/com/android/server/sensorprivacy/CameraPrivacyLightController.java

+3 −1
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ import java.util.ArrayList; 
import java.util.List;

import java.util.Set;

import java.util.concurrent.Executor;

import java.util.concurrent.TimeUnit;





class CameraPrivacyLightController implements AppOpsManager.OnOpActiveChangedListener,

        SensorEventListener {
@@ -275,7 +277,7 @@ class CameraPrivacyLightController implements AppOpsManager.OnOpActiveChangedLis 
    public void onSensorChanged(SensorEvent event) {

        // Using log space to represent human sensation (Fechner's Law) instead of lux

        // because lux values causes bright flashes to skew the average very high.

        addElement(event.timestamp, Math.max(0,

        addElement(TimeUnit.NANOSECONDS.toMillis(event.timestamp), Math.max(0,

                (int) (Math.log(event.values[0]) * LIGHT_VALUE_MULTIPLIER)));

        updateLightSession();

        mHandler.removeCallbacksAndMessages(mDelayedUpdateToken);