From d7ccf2bf7216fa5f856ab4d70392e081b4c83556 Mon Sep 17 00:00:00 2001 From: Heemin Seog Date: Tue, 25 Aug 2020 19:40:37 -0700 Subject: Allow brightnessSensor to be nullable Bug: 166169781 Test: manual Change-Id: I8623f0de35997efe49b506dc927de2a2a4d5a0dc --- .../SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java | 4 +++- .../SystemUI/src/com/android/systemui/doze/dagger/DozeModule.java | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java b/packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java index 342818de3d1e..d9f971731f29 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java @@ -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; diff --git a/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeModule.java b/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeModule.java index 04f7c368fdc4..b89946028aeb 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeModule.java +++ b/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeModule.java @@ -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)); -- cgit v1.2.3-59-g8ed1b