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

Commit fbdc07c5 authored by Scott Mertz's avatar Scott Mertz Committed by Danny Baumann
Browse files

Telecomm: Move to CmHardwareService 

Change-Id: Ia665f105bd578da880275b740c97cd79437d8478
parent 57cde339

Android.mk

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



LOCAL_JAVA_LIBRARIES := \

        org.cyanogenmod.hardware \

        telephony-common



LOCAL_STATIC_JAVA_LIBRARIES := \

AndroidManifest.xml

+0 −2
Original line number Diff line number Diff line
@@ -71,8 +71,6 @@ 
            android:allowBackup="false"

            android:supportsRtl="true">



        <uses-library android:name="org.cyanogenmod.hardware" android:required="false" />



        <!-- CALL vs CALL_PRIVILEGED vs CALL_EMERGENCY

             We have three different intents through which a call can be initiated each with its

             own behavior.

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

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



import android.content.Context;

import android.hardware.CmHardwareManager;

import android.os.PowerManager;

import org.cyanogenmod.hardware.TapToWake;



/**

 * This class manages the proximity sensor and allows callers to turn it on and off.
@@ -28,10 +28,11 @@ public class ProximitySensorManager extends CallsManagerListenerBase { 


    private final PowerManager.WakeLock mProximityWakeLock;

    private boolean mWasTapToWakeEnabled = false;

    private final CmHardwareManager mCmHardwareManager;



    public ProximitySensorManager(Context context) {

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



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

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

            mProximityWakeLock = pm.newWakeLock(

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

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

            mProximityWakeLock.acquire();

            if (isTapToWakeSupported()) {

                mWasTapToWakeEnabled = TapToWake.isEnabled();

                TapToWake.setEnabled(false);

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

                mWasTapToWakeEnabled =

                        mCmHardwareManager.get(CmHardwareManager.FEATURE_TAP_TO_WAKE);

                mCmHardwareManager.set(CmHardwareManager.FEATURE_TAP_TO_WAKE, false);

            }

        } else {

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

        }

        if (mProximityWakeLock.isHeld()) {

            if (isTapToWakeSupported() && mWasTapToWakeEnabled) {

                TapToWake.setEnabled(true);

            if (mCmHardwareManager.isSupported(CmHardwareManager.FEATURE_TAP_TO_WAKE)

                    && mWasTapToWakeEnabled) {

                mCmHardwareManager.set(CmHardwareManager.FEATURE_TAP_TO_WAKE, true);

            }

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

            int flags =
@@ -94,13 +97,4 @@ public class ProximitySensorManager extends CallsManagerListenerBase { 
            Log.i(this, "Proximity wake lock already released");

        }

    }



    private static boolean isTapToWakeSupported() {

        try {

            return TapToWake.isSupported();

        } catch (NoClassDefFoundError e) {

            // Hardware abstraction framework not installed

            return false;

        }

    }

}