summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Babak Bostan <babakbo@google.com> 2020-04-24 04:47:55 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-04-24 04:47:55 +0000
commitedd37fef375fe3efa4c17cdc43cb4ed9fb13e3f8 (patch)
tree1d7604535a7c66972652cc66df3dbdc145947870
parentbf3079a2ba245b7862a0cb8f5f95291ca49d9ace (diff)
parent9ac22b6d51dcc69b421b3121fd093082c9c62994 (diff)
Merge "Add dagger provider for DisplayManager" into rvc-dev
-rw-r--r--packages/SystemUI/src/com/android/systemui/dagger/SystemServicesModule.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemServicesModule.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemServicesModule.java
index 8f3dc224384b..2b27436c85dd 100644
--- a/packages/SystemUI/src/com/android/systemui/dagger/SystemServicesModule.java
+++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemServicesModule.java
@@ -37,6 +37,7 @@ import android.content.pm.PackageManager;
import android.content.pm.ShortcutManager;
import android.content.res.Resources;
import android.hardware.SensorPrivacyManager;
+import android.hardware.display.DisplayManager;
import android.media.AudioManager;
import android.net.ConnectivityManager;
import android.net.NetworkScoreManager;
@@ -113,6 +114,12 @@ public class SystemServicesModule {
}
@Provides
+ @Singleton
+ static DevicePolicyManager provideDevicePolicyManager(Context context) {
+ return context.getSystemService(DevicePolicyManager.class);
+ }
+
+ @Provides
@DisplayId
static int provideDisplayId(Context context) {
return context.getDisplayId();
@@ -120,8 +127,8 @@ public class SystemServicesModule {
@Provides
@Singleton
- static DevicePolicyManager provideDevicePolicyManager(Context context) {
- return context.getSystemService(DevicePolicyManager.class);
+ static DisplayManager provideDisplayManager(Context context) {
+ return context.getSystemService(DisplayManager.class);
}
@Singleton