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

Commit 260eef69 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 am: e5c4d99e 

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



Change-Id: I90d1dc9f0e2b6588919eee755b7934ffec0af95a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fb3ad609 e5c4d99e

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

+16 −0
Original line number Diff line number Diff line
@@ -32,6 +32,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;
@@ -80,6 +81,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;
@@ -147,6 +149,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) {
@@ -265,6 +274,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