Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow brightnessSensor to be nullable"

Browse Source
This commit is contained in:
Heemin Seog
2020-08-27 16:53:24 +00:00
committed by Android (Google) Code Review
parent cb5b4e97dc d7ccf2bf72
commit e4a6bce20a
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java
View File

@@ -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;

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

@@ -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));