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

Commit 6eea5e67 authored by Steve Kondik's avatar Steve Kondik
Browse files

telecom: Move CMHW to CMSDK 

Change-Id: I06228edfdbdf48fcfd3e3c7b7136c20b0a08d369
parent a623a11e

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ LOCAL_PATH:= $(call my-dir) 
include $(CLEAR_VARS)



LOCAL_JAVA_LIBRARIES := telephony-common

LOCAL_STATIC_JAVA_LIBRARIES += org.cyanogenmod.platform.sdk



LOCAL_SRC_FILES := $(call all-java-files-under, src)

src/com/android/server/telecom/ProximitySensorManager.java

+9 −8
Original line number Diff line number Diff line
@@ -17,9 +17,10 @@ 
package com.android.server.telecom;



import android.content.Context;

import android.hardware.CmHardwareManager;

import android.os.PowerManager;



import cyanogenmod.hardware.CMHardwareManager;



/**

 * This class manages the proximity sensor and allows callers to turn it on and off.

 */
@@ -28,11 +29,11 @@ public class ProximitySensorManager extends CallsManagerListenerBase { 


    private final PowerManager.WakeLock mProximityWakeLock;

    private boolean mWasTapToWakeEnabled = false;

    private final CmHardwareManager mCmHardwareManager;

    private final CMHardwareManager mHardware;



    public ProximitySensorManager(Context context) {

        PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);

        mCmHardwareManager = (CmHardwareManager) context.getSystemService(Context.CMHW_SERVICE);

        mHardware = CMHardwareManager.getInstance(context);

        if (pm.isWakeLockLevelSupported(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK)) {

            mProximityWakeLock = pm.newWakeLock(

                    PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK, TAG);
@@ -66,10 +67,10 @@ public class ProximitySensorManager extends CallsManagerListenerBase { 
        if (!mProximityWakeLock.isHeld()) {

            Log.i(this, "Acquiring proximity wake lock");

            mProximityWakeLock.acquire();

            if (mCmHardwareManager.isSupported(CmHardwareManager.FEATURE_TAP_TO_WAKE)) {

            if (mHardware.isSupported(CMHardwareManager.FEATURE_TAP_TO_WAKE)) {

                mWasTapToWakeEnabled =

                        mCmHardwareManager.get(CmHardwareManager.FEATURE_TAP_TO_WAKE);

                mCmHardwareManager.set(CmHardwareManager.FEATURE_TAP_TO_WAKE, false);

                        mHardware.get(CMHardwareManager.FEATURE_TAP_TO_WAKE);

                mHardware.set(CMHardwareManager.FEATURE_TAP_TO_WAKE, false);

            }

        } else {

            Log.i(this, "Proximity wake lock already acquired");
@@ -85,9 +86,9 @@ public class ProximitySensorManager extends CallsManagerListenerBase { 
            return;

        }

        if (mProximityWakeLock.isHeld()) {

            if (mCmHardwareManager.isSupported(CmHardwareManager.FEATURE_TAP_TO_WAKE)

            if (mHardware.isSupported(CMHardwareManager.FEATURE_TAP_TO_WAKE)

                    && mWasTapToWakeEnabled) {

                mCmHardwareManager.set(CmHardwareManager.FEATURE_TAP_TO_WAKE, true);

                mHardware.set(CMHardwareManager.FEATURE_TAP_TO_WAKE, true);

            }

            Log.i(this, "Releasing proximity wake lock");

            int flags =