Merge "Add dagger provider for DisplayManager" into rvc-dev (edd37fef) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/dagger/SystemServicesModule.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -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;
		@@ -112,6 +113,12 @@ public class SystemServicesModule {
		return context.getContentResolver();
		}

		@Provides
		@Singleton
		static DevicePolicyManager provideDevicePolicyManager(Context context) {
		return context.getSystemService(DevicePolicyManager.class);
		}

		@Provides
		@DisplayId
		static int provideDisplayId(Context context) {
		@@ -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