Merge remote-tracking branch 'goog/ics-aah'
diff --git a/audio/Android.mk b/audio/Android.mk
index e00486f..899b1fc 100644
--- a/audio/Android.mk
+++ b/audio/Android.mk
@@ -24,7 +24,6 @@
LOCAL_SHARED_LIBRARIES := \
libcutils \
libutils \
- libmedia \
libhardware_legacy
LOCAL_SHARED_LIBRARIES += libdl
diff --git a/audio/AudioHardwareGeneric.cpp b/audio/AudioHardwareGeneric.cpp
index 75d1540..61d9999 100644
--- a/audio/AudioHardwareGeneric.cpp
+++ b/audio/AudioHardwareGeneric.cpp
@@ -30,7 +30,6 @@
#include <utils/String8.h>
#include "AudioHardwareGeneric.h"
-#include <media/AudioRecord.h>
namespace android_audio_legacy {
@@ -271,7 +270,7 @@
String8 key = String8(AudioParameter::keyRouting);
status_t status = NO_ERROR;
int device;
- LOGV("setParameters() %s", keyValuePairs.string());
+ ALOGV("setParameters() %s", keyValuePairs.string());
if (param.getInt(key, device) == NO_ERROR) {
mDevice = device;
@@ -294,7 +293,7 @@
param.addInt(key, (int)mDevice);
}
- LOGV("getParameters() %s", param.toString().string());
+ ALOGV("getParameters() %s", param.toString().string());
return param.toString();
}
@@ -316,12 +315,12 @@
AudioSystem::audio_in_acoustics acoustics)
{
if (pFormat == 0 || pChannels == 0 || pRate == 0) return BAD_VALUE;
- LOGV("AudioStreamInGeneric::set(%p, %d, %d, %d, %u)", hw, fd, *pFormat, *pChannels, *pRate);
+ ALOGV("AudioStreamInGeneric::set(%p, %d, %d, %d, %u)", hw, fd, *pFormat, *pChannels, *pRate);
// check values
if ((*pFormat != format()) ||
(*pChannels != channels()) ||
(*pRate != sampleRate())) {
- LOGE("Error opening input channel");
+ ALOGE("Error opening input channel");
*pFormat = format();
*pChannels = channels();
*pRate = sampleRate();
@@ -342,7 +341,7 @@
{
AutoMutex lock(mLock);
if (mFd < 0) {
- LOGE("Attempt to read from unopened device");
+ ALOGE("Attempt to read from unopened device");
return NO_INIT;
}
return ::read(mFd, buffer, bytes);
@@ -379,7 +378,7 @@
String8 key = String8(AudioParameter::keyRouting);
status_t status = NO_ERROR;
int device;
- LOGV("setParameters() %s", keyValuePairs.string());
+ ALOGV("setParameters() %s", keyValuePairs.string());
if (param.getInt(key, device) == NO_ERROR) {
mDevice = device;
@@ -402,7 +401,7 @@
param.addInt(key, (int)mDevice);
}
- LOGV("getParameters() %s", param.toString().string());
+ ALOGV("getParameters() %s", param.toString().string());
return param.toString();
}
diff --git a/power/Android.mk b/power/Android.mk
new file mode 100644
index 0000000..30d21a3
--- /dev/null
+++ b/power/Android.mk
@@ -0,0 +1,28 @@
+# Copyright (C) 2012 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.
+
+
+LOCAL_PATH := $(call my-dir)
+
+# HAL module implemenation stored in
+# hw/<POWERS_HARDWARE_MODULE_ID>.<ro.hardware>.so
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_CFLAGS += -DQEMU_HARDWARE
+LOCAL_SHARED_LIBRARIES := liblog libcutils
+LOCAL_SRC_FILES := power_qemu.c
+LOCAL_MODULE := power.goldfish
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_SHARED_LIBRARY)
diff --git a/power/power_qemu.c b/power/power_qemu.c
new file mode 100644
index 0000000..d4251e0
--- /dev/null
+++ b/power/power_qemu.c
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+
+#define LOG_TAG "emulator PowerHAL"
+#include <utils/Log.h>
+
+#include <hardware/hardware.h>
+#include <hardware/power.h>
+#include <hardware/qemud.h>
+#include <fcntl.h>
+#include <errno.h>
+
+static int qemud_fd;
+
+static void power_qemu_init(struct power_module *module)
+{
+ qemud_fd = qemud_channel_open("hw-control");
+
+ if (qemud_fd < 0)
+ ALOGE("Error connecting to qemud hw-control service\n");
+}
+
+static void power_qemu_set_interactive(struct power_module *module, int on)
+{
+ int r;
+
+ r = qemud_channel_send(qemud_fd, on ? "power:screen_state:wake"
+ : "power:screen_state:standby", -1);
+
+ if (r < 0)
+ ALOGE("Error sending power command to qemud hw-control service\n");
+}
+
+static struct hw_module_methods_t power_qemu_module_methods = {
+ .open = NULL,
+};
+
+struct power_module HAL_MODULE_INFO_SYM = {
+ .common = {
+ .tag = HARDWARE_MODULE_TAG,
+ .version_major = 1,
+ .version_minor = 0,
+ .id = POWER_HARDWARE_MODULE_ID,
+ .name = "Emulator Power HAL",
+ .author = "The Android Open Source Project",
+ .methods = &power_qemu_module_methods,
+ },
+
+ .init = power_qemu_init,
+ .setInteractive = power_qemu_set_interactive,
+};
