diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 723aed0..4c76fda 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -15,13 +15,8 @@
# Inherit from qcom-common
-include device/samsung/qcom-common/BoardConfigCommon.mk
-#-include vendor/qcom/proprietary/common/msm8226/BoardConfigVendor.mk
-
VENDOR_PATH := device/samsung/msm8226-common
-#QC_PROP_ROOT := vendor/qcom/proprietary
-#PROTOBUF_SUPPORTED := true
-
include device/samsung/msm8226-common/board/*.mk
TARGET_SPECIFIC_HEADER_PATH := $(VENDOR_PATH)/include
@@ -32,12 +27,14 @@ BOARD_HARDWARE_CLASS += $(VENDOR_PATH)/cmhw
# Filesystem
TARGET_FS_CONFIG_GEN := device/samsung/msm8226-common/config.fs
-#ADB
-TARGET_USES_LEGACY_ADB_INTERFACE :=true
+BOARD_USES_QCOM_HARDWARE := true
-#HIDL
-PRODUCT_COPY_FILES += \
- $(VENDOR_PATH)/manifest.xml:system/vendor/manifest.xml
+# HIDL
+DEVICE_MANIFEST_FILE := $(VENDOR_PATH)/manifest.xml
+DEVICE_MATRIX_FILE := $(VENDOR_PATH)/compatibility_matrix.xml
+
+# Light
+TARGET_PROVIDES_LIBLIGHT := true
# Fonts
EXTENDED_FONT_FOOTPRINT := true
diff --git a/compatibility_matrix.xml b/compatibility_matrix.xml
new file mode 100644
index 0000000..1dcaa97
--- /dev/null
+++ b/compatibility_matrix.xml
@@ -0,0 +1,86 @@
+
+
+ android.frameworks.displayservice
+ 1.0
+
+ IDisplayService
+ default
+
+
+
+ android.frameworks.schedulerservice
+ 1.0
+
+ ISchedulingPolicyService
+ default
+
+
+
+ android.frameworks.sensorservice
+ 1.0
+
+ ISensorManager
+ default
+
+
+
+ android.hardware.graphics.composer
+ 2.1
+
+ IComposer
+ vr
+
+
+
+ android.hidl.allocator
+ 1.0
+
+ IAllocator
+ ashmem
+
+
+
+ android.hidl.manager
+ 1.1
+
+ IServiceManager
+ default
+
+
+
+ android.hidl.memory
+ 1.0
+
+ IMapper
+ ashmem
+
+
+
+ android.hidl.token
+ 1.0
+
+ ITokenManager
+ default
+
+
+
+ android.system.net.netd
+ 1.0
+
+ INetd
+ default
+
+
+
+ android.system.wifi.keystore
+ 1.0
+
+ IKeystore
+ default
+
+
+
+ netutils-wrapper
+ 1.0
+
+
diff --git a/liblights/Android.mk b/liblights/Android.mk
new file mode 100644
index 0000000..1fe0c88
--- /dev/null
+++ b/liblights/Android.mk
@@ -0,0 +1,27 @@
+#
+# Copyright (C) 2014 The CyanogenMod 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/..so
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := lights.c
+LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_SHARED_LIBRARIES := liblog libhardware
+LOCAL_MODULE := lights.$(TARGET_BOARD_PLATFORM)
+LOCAL_MODULE_TAGS := optional
+LOCAL_VENDOR_MODULE := true
+include $(BUILD_SHARED_LIBRARY)
diff --git a/liblights/NOTICE b/liblights/NOTICE
new file mode 100644
index 0000000..316b4eb
--- /dev/null
+++ b/liblights/NOTICE
@@ -0,0 +1,190 @@
+
+ Copyright (c) 2014, 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.
+
+ 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.
+
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
diff --git a/liblights/lights.c b/liblights/lights.c
new file mode 100644
index 0000000..3e1088c
--- /dev/null
+++ b/liblights/lights.c
@@ -0,0 +1,362 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ * Copyright (C) 2013 The CyanogenMod 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_NDEBUG 0
+#define LOG_TAG "lights"
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#define UNUSED __attribute__((unused))
+
+static pthread_once_t g_init = PTHREAD_ONCE_INIT;
+static pthread_mutex_t g_lock = PTHREAD_MUTEX_INITIALIZER;
+
+char const*const PANEL_FILE = "/sys/class/leds/lcd-backlight/brightness";
+char const*const BUTTON_FILE = "/sys/class/leds/button-backlight/brightness";
+
+char const*const LED_BLINK = "/sys/class/sec/led/led_blink";
+
+struct led_config {
+ unsigned int color;
+ int delay_on, delay_off;
+};
+
+static struct led_config g_leds[3]; // For battery, notifications, and attention.
+static int g_cur_led = -1; // Presently showing LED of the above.
+
+void init_g_lock(void)
+{
+ pthread_mutex_init(&g_lock, NULL);
+}
+
+static int write_int(char const *path, int value)
+{
+ int fd;
+ static int already_warned;
+
+ already_warned = 0;
+
+ ALOGV("write_int: path %s, value %d", path, value);
+ fd = open(path, O_RDWR);
+
+ if (fd >= 0) {
+ char buffer[20];
+ int bytes = sprintf(buffer, "%d\n", value);
+ int amt = write(fd, buffer, bytes);
+ close(fd);
+ return amt == -1 ? -errno : 0;
+ } else {
+ if (already_warned == 0) {
+ ALOGE("write_int failed to open %s\n", path);
+ already_warned = 1;
+ }
+ return -errno;
+ }
+}
+
+/* Currently unused.
+static int read_int(char const *path)
+{
+ int fd;
+ char buffer[2];
+
+ fd = open(path, O_RDONLY);
+
+ if (fd >= 0) {
+ read(fd, buffer, 1);
+ }
+ close(fd);
+
+ return atoi(buffer);
+}
+*/
+
+static int write_str(char const *path, const char* value)
+{
+ int fd;
+ static int already_warned;
+
+ already_warned = 0;
+
+ ALOGV("write_str: path %s, value %s", path, value);
+ fd = open(path, O_RDWR);
+
+ if (fd >= 0) {
+ int amt = write(fd, value, strlen(value));
+ close(fd);
+ return amt == -1 ? -errno : 0;
+ } else {
+ if (already_warned == 0) {
+ ALOGE("write_str failed to open %s\n", path);
+ already_warned = 1;
+ }
+ return -errno;
+ }
+}
+
+static int rgb_to_brightness(struct light_state_t const *state)
+{
+ int color = state->color & 0x00ffffff;
+
+ return ((77*((color>>16) & 0x00ff))
+ + (150*((color>>8) & 0x00ff)) + (29*(color & 0x00ff))) >> 8;
+}
+
+/* Previously used by set_light_leds.
+static int get_calibrated_color(struct light_state_t const *state, int brightness)
+{
+ int red = (state->color >> 16) & 0xFF;
+ int green = ((state->color >> 8) & 0xFF) * 0.7;
+ int blue = (state->color & 0x00FF) * 0.8;
+
+ return (((red * brightness) / 255) << 16) + (((green * brightness) / 255) << 8) + ((blue * brightness) / 255);
+}
+*/
+
+static int is_lit(struct light_state_t const* state)
+{
+ return state->color & 0x00ffffff;
+}
+
+static int set_light_backlight(UNUSED struct light_device_t *dev,
+ struct light_state_t const *state)
+{
+ int err = 0;
+ int brightness = rgb_to_brightness(state);
+
+ pthread_mutex_lock(&g_lock);
+ err = write_int(PANEL_FILE, brightness);
+
+ pthread_mutex_unlock(&g_lock);
+ return err;
+}
+
+static int
+set_light_buttons(UNUSED struct light_device_t* dev,
+ struct light_state_t const* state)
+{
+ int err = 0;
+ int on = is_lit(state);
+
+ pthread_mutex_lock(&g_lock);
+ err = write_int(BUTTON_FILE, on?1:0);
+ pthread_mutex_unlock(&g_lock);
+
+ return err;
+
+}
+
+static int close_lights(struct light_device_t *dev)
+{
+ ALOGV("close_light is called");
+ if (dev)
+ free(dev);
+
+ return 0;
+}
+
+/* LEDs */
+static int write_leds(const struct led_config *led)
+{
+ static const struct led_config led_off = {0, 0, 0};
+
+ char blink[32];
+ int count, err;
+
+ if (led == NULL)
+ led = &led_off;
+
+ if ((count = snprintf(blink, sizeof(blink)-1, "0x%08x %d %d", led->color,
+ led->delay_on, led->delay_off)) < 0) {
+ return -errno;
+ } else if ((unsigned int)count >= sizeof(blink)-1) {
+ ALOGE("%s: Truncated string: blink=\"%s\".", __func__, blink);
+ return -EINVAL;
+ }
+
+ ALOGD("%s: color=0x%08x, delay_on=%d, delay_off=%d, blink=\"%s\".",
+ __func__, led->color, led->delay_on, led->delay_off, blink);
+
+ /* Add '\n' here to make the above log message clean. */
+ blink[count] = '\n';
+ blink[count+1] = '\0';
+
+ pthread_mutex_lock(&g_lock);
+ err = write_str(LED_BLINK, blink);
+ pthread_mutex_unlock(&g_lock);
+
+ return err;
+}
+
+static int set_light_leds(struct light_state_t const *state, int type)
+{
+ struct led_config *led;
+ int err = 0;
+
+ ALOGD("%s: type=%d, color=0x%010x, fM=%d, fOnMS=%d, fOffMs=%d.", __func__,
+ type, state->color,state->flashMode, state->flashOnMS, state->flashOffMS);
+
+ if (type < 0 || (unsigned int)type >= sizeof(g_leds)/sizeof(g_leds[0]))
+ return -EINVAL;
+
+ /* type is one of:
+ * 0. battery
+ * 1. notifications
+ * 2. attention
+ * which are multiplexed onto the same physical LED in the above order. */
+ led = &g_leds[type];
+
+ switch (state->flashMode) {
+ case LIGHT_FLASH_NONE:
+ /* Set LED to a solid color, spec is unclear on the exact behavior here. */
+ led->delay_on = led->delay_off = 0;
+ break;
+ case LIGHT_FLASH_TIMED:
+ case LIGHT_FLASH_HARDWARE:
+ led->delay_on = state->flashOnMS;
+ led->delay_off = state->flashOffMS;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ led->color = state->color & 0x00ffffff;
+
+ if (led->color > 0) {
+ /* This LED is lit. */
+ if (type >= g_cur_led) {
+ /* And it has the highest priority, so show it. */
+ err = write_leds(led);
+ g_cur_led = type;
+ }
+ } else {
+ /* This LED is not (any longer) lit. */
+ if (type == g_cur_led) {
+ /* But it is currently showing, switch to a lower-priority LED. */
+ int i;
+
+ for (i = type-1; i >= 0; i--) {
+ if (g_leds[i].color > 0) {
+ /* Found a lower-priority LED to switch to. */
+ err = write_leds(&g_leds[i]);
+ goto switched;
+ }
+ }
+
+ /* No LEDs are lit, turn off. */
+ err = write_leds(NULL);
+switched:
+ g_cur_led = i;
+ }
+ }
+
+ return err;
+}
+
+static int set_light_leds_battery(UNUSED struct light_device_t *dev,
+ struct light_state_t const *state)
+{
+ return set_light_leds(state, 0);
+}
+
+static int set_light_leds_notifications(UNUSED struct light_device_t *dev,
+ struct light_state_t const *state)
+{
+ return set_light_leds(state, 1);
+}
+
+static int set_light_leds_attention(UNUSED struct light_device_t *dev,
+ struct light_state_t const *state)
+{
+ struct light_state_t fixed;
+
+ memcpy(&fixed, state, sizeof(fixed));
+
+ /* The framework does odd things with the attention lights, fix them up to
+ * do something sensible here. */
+ switch (fixed.flashMode) {
+ case LIGHT_FLASH_NONE:
+ /* LightsService.Light::stopFlashing calls with non-zero color. */
+ fixed.color = 0;
+ break;
+ case LIGHT_FLASH_HARDWARE:
+ /* PowerManagerService::setAttentionLight calls with onMS=3, offMS=0, which
+ * just makes for a slightly-dimmer LED. */
+ if (fixed.flashOnMS > 0 && fixed.flashOffMS == 0)
+ fixed.flashMode = LIGHT_FLASH_NONE;
+ break;
+ }
+
+ return set_light_leds(&fixed, 2);
+}
+
+static int open_lights(const struct hw_module_t *module, char const *name,
+ struct hw_device_t **device)
+{
+ int (*set_light)(struct light_device_t *dev,
+ struct light_state_t const *state);
+
+ if (0 == strcmp(LIGHT_ID_BACKLIGHT, name))
+ set_light = set_light_backlight;
+ else if (0 == strcmp(LIGHT_ID_BUTTONS, name))
+ set_light = set_light_buttons;
+ else if (0 == strcmp(LIGHT_ID_BATTERY, name))
+ set_light = set_light_leds_battery;
+ else if (0 == strcmp(LIGHT_ID_NOTIFICATIONS, name))
+ set_light = set_light_leds_notifications;
+ else if (0 == strcmp(LIGHT_ID_ATTENTION, name))
+ set_light = set_light_leds_attention;
+ else
+ return -EINVAL;
+
+ pthread_once(&g_init, init_g_lock);
+
+ struct light_device_t *dev = malloc(sizeof(struct light_device_t));
+ memset(dev, 0, sizeof(*dev));
+
+ dev->common.tag = HARDWARE_DEVICE_TAG;
+ dev->common.version = 0;
+ dev->common.module = (struct hw_module_t *)module;
+ dev->common.close = (int (*)(struct hw_device_t *))close_lights;
+ dev->set_light = set_light;
+
+ *device = (struct hw_device_t *)dev;
+
+ return 0;
+}
+
+static struct hw_module_methods_t lights_module_methods = {
+ .open = open_lights,
+};
+
+struct hw_module_t HAL_MODULE_INFO_SYM = {
+ .tag = HARDWARE_MODULE_TAG,
+ .version_major = 1,
+ .version_minor = 0,
+ .id = LIGHTS_HARDWARE_MODULE_ID,
+ .name = "D2 Lights Module",
+ .author = "The CyanogenMod Project",
+ .methods = &lights_module_methods,
+};
diff --git a/manifest.xml b/manifest.xml
index 8105c51..635b5c9 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,37 +1,51 @@
- android.hardware.graphics.allocator
- passthrough
- 2.0
-
- IAllocator
- default
-
-
-
- android.hardware.light
- passthrough
- 2.0
-
- ILight
- default
-
-
-
- android.hardware.wifi
+ android.hardware.audio
hwbinder
- 1.1
+ 2.0
- IWifi
+ IDevicesFactory
default
- android.hardware.wifi.supplicant
+ android.hardware.audio.effect
+ hwbinder
+ 2.0
+
+ IEffectsFactory
+ default
+
+
+
+ android.hardware.bluetooth
hwbinder
1.0
- ISupplicant
+ IBluetoothHci
+ default
+
+
+
+ android.hardware.broadcastradio
+ passthrough
+ 1.0
+
+
+ android.hardware.camera.provider
+ hwbinder
+ 2.4
+
+ ICameraProvider
+ legacy/0
+
+
+
+ android.hardware.cas
+ hwbinder
+ 1.0
+
+ IMediaCasService
default
@@ -44,6 +58,46 @@
default
+
+ android.hardware.drm
+ hwbinder
+ 1.0
+
+ ICryptoFactory
+ default
+
+
+ IDrmFactory
+ default
+
+
+
+ android.hardware.gnss
+ hwbinder
+ 1.0
+
+ IGnss
+ default
+
+
+
+ android.hardware.graphics.allocator
+ hwbinder
+ 2.0
+
+ IAllocator
+ default
+
+
+
+ android.hardware.graphics.composer
+ hwbinder
+ 2.1
+
+ IComposer
+ default
+
+
android.hardware.graphics.mapper
passthrough
@@ -53,9 +107,49 @@
default
+
+ android.hardware.keymaster
+ hwbinder
+ 3.0
+
+ IKeymasterDevice
+ default
+
+
+
+ android.hardware.light
+ hwbinder
+ 2.0
+
+ ILight
+ default
+
+
+
+ android.hardware.media.omx
+ hwbinder
+ 1.0
+
+ IOmx
+ default
+
+
+ IOmxStore
+ default
+
+
+
+ android.hardware.memtrack
+ hwbinder
+ 1.0
+
+ IMemtrack
+ default
+
+
android.hardware.nfc
- passthrough
+ hwbinder
1.0
INfc
@@ -63,11 +157,11 @@
- android.hardware.sensors
- passthrough
+ android.hardware.power
+ hwbinder
1.0
- ISensors
+ IPower
default
@@ -93,4 +187,76 @@
slot1
+
+ android.hardware.renderscript
+ passthrough
+ 1.0
+
+ IDevice
+ default
+
+
+
+ android.hardware.sensors
+ hwbinder
+ 1.0
+
+ ISensors
+ default
+
+
+
+ android.hardware.soundtrigger
+ hwbinder
+ 2.0
+
+ ISoundTriggerHw
+ default
+
+
+
+ android.hardware.usb
+ hwbinder
+ 1.0
+
+ IUsb
+ default
+
+
+
+ android.hardware.vibrator
+ hwbinder
+ 1.0
+
+ IVibrator
+ default
+
+
+
+ android.hardware.wifi
+ hwbinder
+ 1.1
+
+ IWifi
+ default
+
+
+
+ android.hardware.wifi.supplicant
+ hwbinder
+ 1.0
+
+ ISupplicant
+ default
+
+
+
+ android.hardware.gatekeeper
+ passthrough
+ 1.0
+
+ IGatekeeper
+ default
+
+
diff --git a/msm8226.mk b/msm8226.mk
index b5a9fd7..e18416a 100644
--- a/msm8226.mk
+++ b/msm8226.mk
@@ -193,7 +193,7 @@ PRODUCT_PACKAGES += \
# Vibrator
PRODUCT_PACKAGES += \
- android.hardware.vibrator@1.0-impl
+ android.hardware.vibrator@1.0-service.lineage
# USB HAL
PRODUCT_PACKAGES += \
diff --git a/power/Android.mk b/power/Android.mk
index c2bb86c..3e2da09 100644
--- a/power/Android.mk
+++ b/power/Android.mk
@@ -1,5 +1,5 @@
#
-# Copyright 2019 The LineageOS Project
+# Copyright 2016 The CyanogenMod Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_C_INCLUDES := $(TARGET_POWERHAL_HEADER_PATH)
LOCAL_SRC_FILES := power.c
-LOCAL_SHARED_LIBRARIES := liblog libcutils
+LOCAL_SHARED_LIBRARIES := liblog libcutils libhardware
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := power.msm8226
diff --git a/power/power.c b/power/power.c
index c34b0ba..21bcf87 100644
--- a/power/power.c
+++ b/power/power.c
@@ -23,7 +23,8 @@
#include
#include
-#include
+#include
+#include
#include "power.h"
@@ -38,7 +39,8 @@
static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
static int boostpulse_fd = -1;
-static int current_power_profile = -1;
+// Balanced profile by default
+static int current_power_profile = 1;
static int requested_power_profile = -1;
static int sysfs_write_str(char *path, char *s)
@@ -103,68 +105,16 @@ static void power_set_interactive_ext(int on) {
static void power_set_interactive(__attribute__((unused)) struct power_module *module, int on)
{
- if (!is_profile_valid(current_power_profile)) {
- ALOGD("%s: no power profile selected yet", __func__);
- return;
- }
-
+ /* We want to first set the input device state otherwise
+ * it never gets turned off/on when our HAL isnt compatible with the power_profiles from
+ * our framework
+ */
power_set_interactive_ext(on);
-
- if (on) {
- sysfs_write_int(INTERACTIVE_PATH "hispeed_freq",
- profiles[current_power_profile].hispeed_freq);
- sysfs_write_int(INTERACTIVE_PATH "go_hispeed_load",
- profiles[current_power_profile].go_hispeed_load);
- sysfs_write_int(INTERACTIVE_PATH "target_loads",
- profiles[current_power_profile].target_loads);
- sysfs_write_int(CPUFREQ_PATH "scaling_min_freq",
- profiles[current_power_profile].scaling_min_freq);
- } else {
- sysfs_write_int(INTERACTIVE_PATH "hispeed_freq",
- profiles[current_power_profile].hispeed_freq_off);
- sysfs_write_int(INTERACTIVE_PATH "go_hispeed_load",
- profiles[current_power_profile].go_hispeed_load_off);
- sysfs_write_int(INTERACTIVE_PATH "target_loads",
- profiles[current_power_profile].target_loads_off);
- sysfs_write_int(CPUFREQ_PATH "scaling_min_freq",
- profiles[current_power_profile].scaling_min_freq_off);
- }
}
-static void set_power_profile(int profile)
+static void set_power_profile(__attribute__((unused)) int profile)
{
- if (!is_profile_valid(profile)) {
- ALOGE("%s: unknown profile: %d", __func__, profile);
- return;
- }
-
- if (profile == current_power_profile)
- return;
-
- ALOGD("%s: setting profile %d", __func__, profile);
-
- sysfs_write_int(INTERACTIVE_PATH "boost",
- profiles[profile].boost);
- sysfs_write_int(INTERACTIVE_PATH "boostpulse_duration",
- profiles[profile].boostpulse_duration);
- sysfs_write_int(INTERACTIVE_PATH "go_hispeed_load",
- profiles[profile].go_hispeed_load);
- sysfs_write_int(INTERACTIVE_PATH "hispeed_freq",
- profiles[profile].hispeed_freq);
- sysfs_write_int(INTERACTIVE_PATH "min_sample_time",
- profiles[profile].min_sample_time);
- sysfs_write_int(INTERACTIVE_PATH "timer_rate",
- profiles[profile].timer_rate);
- sysfs_write_int(INTERACTIVE_PATH "above_hispeed_delay",
- profiles[profile].above_hispeed_delay);
- sysfs_write_int(INTERACTIVE_PATH "target_loads",
- profiles[profile].target_loads);
- sysfs_write_int(CPUFREQ_PATH "scaling_max_freq",
- profiles[profile].scaling_max_freq);
- sysfs_write_int(CPUFREQ_PATH "scaling_min_freq",
- profiles[profile].scaling_min_freq);
-
- current_power_profile = profile;
+ return;
}
static void power_hint(__attribute__((unused)) struct power_module *module,
@@ -175,28 +125,6 @@ static void power_hint(__attribute__((unused)) struct power_module *module,
switch (hint) {
case POWER_HINT_INTERACTION:
- if (!is_profile_valid(current_power_profile)) {
- ALOGD("%s: no power profile selected yet", __func__);
- return;
- }
-
- if (!profiles[current_power_profile].boostpulse_duration)
- return;
-
- if (boostpulse_open() >= 0) {
- snprintf(buf, sizeof(buf), "%d", 1);
- len = write(boostpulse_fd, &buf, sizeof(buf));
- if (len < 0) {
- strerror_r(errno, buf, sizeof(buf));
- ALOGE("Error writing to boostpulse: %s\n", buf);
-
- pthread_mutex_lock(&lock);
- close(boostpulse_fd);
- boostpulse_fd = -1;
- pthread_mutex_unlock(&lock);
- }
- }
- break;
case POWER_HINT_SET_PROFILE:
pthread_mutex_lock(&lock);
set_power_profile(*(int32_t *)data);
@@ -262,7 +190,7 @@ struct power_module HAL_MODULE_INFO_SYM = {
.module_api_version = POWER_MODULE_API_VERSION_0_2,
.hal_api_version = HARDWARE_HAL_API_VERSION,
.id = POWER_HARDWARE_MODULE_ID,
- .name = "msm8226 Power HAL",
+ .name = "MSM8226 Power HAL",
.author = "The LineageOS Project",
.methods = &power_module_methods,
},
@@ -272,4 +200,3 @@ struct power_module HAL_MODULE_INFO_SYM = {
.powerHint = power_hint,
.getFeature = get_feature
};
-
diff --git a/power/power.h b/power/power.h
index 968bde7..baba258 100644
--- a/power/power.h
+++ b/power/power.h
@@ -70,7 +70,8 @@ static power_profile profiles[PROFILE_MAX] = {
.target_loads = 80,
.target_loads_off = 90,
.scaling_max_freq = 1401600,
- .scaling_min_freq = 787200,
+ // Our scaling_min_freq shouldnt be above our minimum any time!
+ .scaling_min_freq = 384000,
.scaling_min_freq_off = 300000,
},
[PROFILE_HIGH_PERFORMANCE] = {
diff --git a/sensors/Android.mk b/sensors/Android.mk
index 6edc35e..842f0f6 100644
--- a/sensors/Android.mk
+++ b/sensors/Android.mk
@@ -34,9 +34,33 @@ LOCAL_SHARED_LIBRARIES := \
libdl \
liblog \
libutils \
+ libhardware
LOCAL_STRIP_MODULE := false
+LOCAL_VENDOR_MODULE := true
include $(BUILD_SHARED_LIBRARY)
+include $(CLEAR_VARS)
+LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_PROPRIETARY_MODULE := true
+LOCAL_MODULE := android.hardware.sensors@1.0-service.s3ve3g
+LOCAL_INIT_RC := android.hardware.sensors@1.0-service.s3ve3g.rc
+LOCAL_SRC_FILES := \
+ service.cpp
+
+LOCAL_SHARED_LIBRARIES := \
+ liblog \
+ libcutils \
+ libdl \
+ libbase \
+ libutils
+
+LOCAL_SHARED_LIBRARIES += \
+ libhidlbase \
+ libhidltransport \
+ android.hardware.sensors@1.0
+
+include $(BUILD_EXECUTABLE)
+
include $(call all-makefiles-under, $(LOCAL_PATH))
diff --git a/sensors/SensorEventQueue.cpp b/sensors/SensorEventQueue.cpp
index f6144f8..dff7ac9 100644
--- a/sensors/SensorEventQueue.cpp
+++ b/sensors/SensorEventQueue.cpp
@@ -17,7 +17,7 @@
#include
#include
#include
-#include
+#include
#include "SensorEventQueue.h"
diff --git a/sensors/android.hardware.sensors@1.0-service.s3ve3g.rc b/sensors/android.hardware.sensors@1.0-service.s3ve3g.rc
new file mode 100644
index 0000000..58fd791
--- /dev/null
+++ b/sensors/android.hardware.sensors@1.0-service.s3ve3g.rc
@@ -0,0 +1,5 @@
+service sensors-hal-1-0 /vendor/bin/hw/android.hardware.sensors@1.0-service.s3ve3g
+ class hal
+ user root
+ group system input wakelock
+ capabilities BLOCK_SUSPEND SYS_NICE
diff --git a/sensors/multihal.cpp b/sensors/multihal.cpp
index 59e3087..40c9e03 100644
--- a/sensors/multihal.cpp
+++ b/sensors/multihal.cpp
@@ -18,7 +18,7 @@
#include "multihal.h"
#define LOG_NDEBUG 1
-#include
+#include
#include
#include
diff --git a/sensors/service.cpp b/sensors/service.cpp
new file mode 100644
index 0000000..4fe495c
--- /dev/null
+++ b/sensors/service.cpp
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2016 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 "android.hardware.sensors@1.0-service.wt88047"
+
+#include
+#include
+
+using android::hardware::sensors::V1_0::ISensors;
+using android::hardware::defaultPassthroughServiceImplementation;
+
+int main() {
+ /* Sensors framework service needs at least two threads.
+ * One thread blocks on a "poll"
+ * The second thread is needed for all other HAL methods.
+ */
+ return defaultPassthroughServiceImplementation(2);
+}
diff --git a/sensors/service/Android.mk b/sensors/service/Android.mk
new file mode 100644
index 0000000..39e19d7
--- /dev/null
+++ b/sensors/service/Android.mk
@@ -0,0 +1,25 @@
+OLD_LOCAL_PATH := $(LOCAL_PATH)
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_PROPRIETARY_MODULE := true
+LOCAL_MODULE := android.hardware.sensors@1.0-service.wt88047
+LOCAL_INIT_RC := android.hardware.sensors@1.0-service.wt88047.rc
+LOCAL_SRC_FILES := \
+ service.cpp
+
+LOCAL_SHARED_LIBRARIES := \
+ liblog \
+ libcutils \
+ libdl \
+ libbase \
+ libutils
+
+LOCAL_SHARED_LIBRARIES += \
+ libhidlbase \
+ libhidltransport \
+ android.hardware.sensors@1.0
+
+include $(BUILD_EXECUTABLE)
+LOCAL_PATH := $(OLD_LOCAL_PATH)