Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0

Conflicts:
	BoardCommonConfig.mk
	camera/Android.mk
	common.mk
	configs/80cfw
	lpm.rc
	overlay/frameworks/base/core/res/res/values/config.xml
	overlay/packages/apps/Camera2/res/values/config.xml

1 files changed, 59 insertions, 0 deletions

diff --git a/libhealthd/healthd_board_exynos4.cpp b/libhealthd/healthd_board_exynos4.cpp
new file mode 100644
index 0000000..7d51c13
--- /dev/null
+++ b/libhealthd/healthd_board_exynos4.cpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2013 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.
+ */
+
+#include <healthd.h>
+
+void
+healthd_board_init(struct healthd_config *config)
+{
+    config->batteryCapacityPath    = "/sys/class/power_supply/battery/capacity";
+    config->batteryStatusPath      = "/sys/class/power_supply/battery/status";
+    config->batteryVoltagePath     = "/sys/class/power_supply/battery/voltage_now";
+    config->batteryCurrentNowPath  = "/sys/class/power_supply/battery/current_now";
+    config->batteryPresentPath     = "/sys/class/power_supply/battery/present";
+    config->batteryHealthPath      = "/sys/class/power_supply/battery/health";
+    config->batteryTemperaturePath = "/sys/class/power_supply/battery/temp";
+    config->batteryTechnologyPath  = "/sys/class/power_supply/battery/technology";
+    // others use defaults
+}
+
+int
+healthd_board_battery_update(struct android::BatteryProperties *props)
+{
+    // return 0 to log periodic polled battery status to kernel log
+    return 0;
+}
+
+void healthd_board_mode_charger_draw_battery(struct android::BatteryProperties*)
+{
+
+}
+
+void healthd_board_mode_charger_battery_update(struct android::BatteryProperties*)
+{
+
+}
+
+void healthd_board_mode_charger_set_backlight(bool)
+{
+
+}
+
+void healthd_board_mode_charger_init()
+{
+
+}