From 608bf43988e2a1a3813cc0ce67555780b2a0c30f Mon Sep 17 00:00:00 2001 From: Govinda Wasserman Date: Fri, 26 Aug 2022 13:00:16 -0400 Subject: Adds some missing injections for VR and PCC Test: Existing tests still pass BUG: 261841686 FIX: 261841686 Change-Id: I407871ea6e4e0f6ae3a9d878d0107b82b3cb9603 --- .../android/systemui/dagger/FrameworkServicesModule.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java b/packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java index 4bb5d04e7fc2..d1c34a8d0821 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java @@ -31,6 +31,7 @@ import android.app.StatsManager; import android.app.UiModeManager; import android.app.WallpaperManager; import android.app.admin.DevicePolicyManager; +import android.app.ambientcontext.AmbientContextManager; import android.app.job.JobScheduler; import android.app.role.RoleManager; import android.app.smartspace.SmartspaceManager; @@ -79,6 +80,7 @@ import android.permission.PermissionManager; import android.safetycenter.SafetyCenterManager; import android.service.dreams.DreamService; import android.service.dreams.IDreamManager; +import android.service.vr.IVrManager; import android.telecom.TelecomManager; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionManager; @@ -146,6 +148,13 @@ public class FrameworkServicesModule { return Optional.ofNullable(context.getSystemService(SystemUpdateManager.class)); } + @Provides + @Nullable + @Singleton + static AmbientContextManager provideAmbientContextManager(Context context) { + return context.getSystemService(AmbientContextManager.class); + } + /** */ @Provides public AmbientDisplayConfiguration provideAmbientDisplayConfiguration(Context context) { @@ -258,6 +267,13 @@ public class FrameworkServicesModule { ServiceManager.getService(DreamService.DREAM_SERVICE)); } + @Provides + @Singleton + @Nullable + static IVrManager provideIVrManager() { + return IVrManager.Stub.asInterface(ServiceManager.getService(Context.VR_SERVICE)); + } + @Provides @Singleton @Nullable -- cgit v1.2.3-59-g8ed1b