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

Commit e4a6bce2 authored by Heemin Seog's avatar Heemin Seog Committed by Android (Google) Code Review
Browse files

Merge "Allow brightnessSensor to be nullable"

parents cb5b4e97 d7ccf2bf

packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java

+3 −1
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ import android.os.UserHandle; 
import android.provider.Settings;

import android.view.Display;



import androidx.annotation.Nullable;



import com.android.systemui.doze.dagger.BrightnessSensor;

import com.android.systemui.doze.dagger.DozeScope;

import com.android.systemui.doze.dagger.WrappedService;
@@ -75,7 +77,7 @@ public class DozeScreenBrightness extends BroadcastReceiver implements DozeMachi 


    @Inject

    public DozeScreenBrightness(Context context, @WrappedService DozeMachine.Service service,

            AsyncSensorManager sensorManager, @BrightnessSensor Sensor lightSensor,

            AsyncSensorManager sensorManager, @Nullable @BrightnessSensor Sensor lightSensor,

            DozeHost host, Handler handler, AlwaysOnDisplayPolicy alwaysOnDisplayPolicy) {

        mContext = context;

        mDozeService = service;

packages/SystemUI/src/com/android/systemui/doze/dagger/DozeModule.java

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ import android.content.Context; 
import android.hardware.Sensor;

import android.os.Handler;



import androidx.annotation.Nullable;



import com.android.systemui.R;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.doze.DozeAuthRemover;
@@ -91,6 +93,7 @@ public abstract class DozeModule { 


    @Provides

    @BrightnessSensor

    @Nullable

    static Sensor providesBrightnessSensor(AsyncSensorManager sensorManager, Context context) {

        return DozeSensors.findSensorWithType(sensorManager,

                context.getString(R.string.doze_brightness_sensor_type));