Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5c4d99e authored by Govinda Wasserman's avatar Govinda Wasserman Committed by Automerger Merge Worker
Browse files

Merge "Adds some missing injections for VR and PCC" into tm-qpr-dev am: 2a670fae 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19755381



Change-Id: I429d2d2fed94e892d886b44ae9f9a53c8c3b5459
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c3767439 2a670fae

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

+16 −0
Original line number Diff line number Diff line
@@ -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