Merge "Vibra: Remove vibrator AOSP implementation from libhardware_legacy"

4 files changed, 1 insertions, 131 deletions

diff --git a/Android.mk b/Android.mk
index aab0963..01711dc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,7 +1,7 @@
 # Copyright 2006 The Android Open Source Project
 
 # Setting LOCAL_PATH will mess up all-subdir-makefiles, so do it beforehand.
-legacy_modules := power uevent vibrator wifi qemu qemu_tracing
+legacy_modules := power uevent wifi qemu qemu_tracing
 
 SAVE_MAKEFILES := $(call all-named-subdir-makefiles,$(legacy_modules))
 LEGACY_AUDIO_MAKEFILES := $(call all-named-subdir-makefiles,audio)
diff --git a/include/hardware_legacy/vibrator.h b/include/hardware_legacy/vibrator.h
deleted file mode 100644
index 7994f62..0000000
--- a/include/hardware_legacy/vibrator.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _HARDWARE_VIBRATOR_H
-#define _HARDWARE_VIBRATOR_H
-
-#if __cplusplus
-extern "C" {
-#endif
-
-/**
- * Return whether the device has a vibrator.
- *
- * @return 1 if a vibrator exists, 0 if it doesn't.
- */
-int vibrator_exists();
-
-/**
- * Turn on vibrator
- *
- * @param timeout_ms number of milliseconds to vibrate
- *
- * @return 0 if successful, -1 if error
- */
-int vibrator_on(int timeout_ms);
-
-/**
- * Turn off vibrator
- *
- * @return 0 if successful, -1 if error
- */
-int vibrator_off();
-
-#if __cplusplus
-}  // extern "C"
-#endif
-
-#endif  // _HARDWARE_VIBRATOR_H
diff --git a/vibrator/Android.mk b/vibrator/Android.mk
deleted file mode 100644
index 6681f84..0000000
--- a/vibrator/Android.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 2006 The Android Open Source Project
-
-LOCAL_SRC_FILES += vibrator/vibrator.c
-
diff --git a/vibrator/vibrator.c b/vibrator/vibrator.c
deleted file mode 100644
index f946ce1..0000000
--- a/vibrator/vibrator.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <hardware_legacy/vibrator.h>
-#include "qemu.h"
-
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#define THE_DEVICE "/sys/class/timed_output/vibrator/enable"
-
-int vibrator_exists()
-{
-    int fd;
-
-#ifdef QEMU_HARDWARE
-    if (qemu_check()) {
-        return 1;
-    }
-#endif
-
-    fd = open(THE_DEVICE, O_RDWR);
-    if(fd < 0)
-        return 0;
-    close(fd);
-    return 1;
-}
-
-static int sendit(int timeout_ms)
-{
-    int nwr, ret, fd;
-    char value[20];
-
-#ifdef QEMU_HARDWARE
-    if (qemu_check()) {
-        return qemu_control_command( "vibrator:%d", timeout_ms );
-    }
-#endif
-
-    fd = open(THE_DEVICE, O_RDWR);
-    if(fd < 0)
-        return errno;
-
-    nwr = sprintf(value, "%d\n", timeout_ms);
-    ret = write(fd, value, nwr);
-
-    close(fd);
-
-    return (ret == nwr) ? 0 : -1;
-}
-
-int vibrator_on(int timeout_ms)
-{
-    /* constant on, up to maximum allowed time */
-    return sendit(timeout_ms);
-}
-
-int vibrator_off()
-{
-    return sendit(0);
-}