summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BoardCommonConfig.mk3
-rw-r--r--common.mk3
-rw-r--r--configs/media_codecs.xml4
-rw-r--r--libhealthd/Android.mk22
-rw-r--r--libhealthd/healthd_board_exynos4.cpp39
-rw-r--r--overlay/packages/apps/Camera2/res/values/config.xml (renamed from overlay/packages/apps/Gallery2/res/values/config.xml)5
-rwxr-xr-xrootdir/fstab.smdk42106
-rw-r--r--rootdir/init.smdk4210.rc31
8 files changed, 96 insertions, 17 deletions
diff --git a/BoardCommonConfig.mk b/BoardCommonConfig.mk
index 8b3c344..b10c77c 100644
--- a/BoardCommonConfig.mk
+++ b/BoardCommonConfig.mk
@@ -171,5 +171,8 @@ BOARD_CHARGER_RES := device/samsung/galaxys2-common/res/charger
BOARD_CUSTOM_BOOTIMG_MK := device/samsung/galaxys2-common/shbootimg.mk
+# Override healthd HAL
+BOARD_HAL_STATIC_LIBRARIES := libhealthd.exynos4
+
# Use the non-open-source parts, if they're present
-include vendor/samsung/galaxys2-common/BoardConfigVendor.mk
diff --git a/common.mk b/common.mk
index 8042656..2f44e10 100644
--- a/common.mk
+++ b/common.mk
@@ -167,7 +167,8 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
frameworks/native/data/etc/android.software.sip.xml:system/etc/permissions/android.software.sip.xml \
- frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml
+ frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
+ frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml
# Feature live wallpaper
PRODUCT_COPY_FILES += \
diff --git a/configs/media_codecs.xml b/configs/media_codecs.xml
index c8719db..7626446 100644
--- a/configs/media_codecs.xml
+++ b/configs/media_codecs.xml
@@ -93,7 +93,8 @@ Only the three quirks included above are recognized at this point:
<MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" />
<MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" />
<MediaCodec name="OMX.google.h264.decoder" type="video/avc" />
- <MediaCodec name="OMX.google.vpx.decoder" type="video/x-vnd.on2.vp8" />
+ <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" />
+ <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" />
</Decoders>
<Encoders>
@@ -105,5 +106,6 @@ Only the three quirks included above are recognized at this point:
<MediaCodec name="OMX.google.amrwb.encoder" type="audio/amr-wb" />
<MediaCodec name="OMX.google.aac.encoder" type="audio/mp4a-latm" />
<MediaCodec name="OMX.google.flac.encoder" type="audio/flac" />
+ <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" />
</Encoders>
</MediaCodecs>
diff --git a/libhealthd/Android.mk b/libhealthd/Android.mk
new file mode 100644
index 0000000..f1b83d6
--- /dev/null
+++ b/libhealthd/Android.mk
@@ -0,0 +1,22 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := healthd_board_exynos4.cpp
+LOCAL_MODULE := libhealthd.exynos4
+LOCAL_C_INCLUDES := system/core/healthd
+include $(BUILD_STATIC_LIBRARY)
diff --git a/libhealthd/healthd_board_exynos4.cpp b/libhealthd/healthd_board_exynos4.cpp
new file mode 100644
index 0000000..5809692
--- /dev/null
+++ b/libhealthd/healthd_board_exynos4.cpp
@@ -0,0 +1,39 @@
+/*
+ * 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/batt_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;
+}
diff --git a/overlay/packages/apps/Gallery2/res/values/config.xml b/overlay/packages/apps/Camera2/res/values/config.xml
index db75d00..4217a77 100644
--- a/overlay/packages/apps/Gallery2/res/values/config.xml
+++ b/overlay/packages/apps/Camera2/res/values/config.xml
@@ -22,9 +22,4 @@
<bool name="needsEarlyVideoSize">true</bool>
<!-- Samsung Camcorder Mode -->
<bool name="needsSamsungCamMode">true</bool>
- <!-- Always use recording dimensions for preview -->
- <bool name="useVideoSizeForPreview">true</bool>
- <!-- The camera removes the focus modes by default when touch-to-focus
- exists. Use this option to change that behavior -->
- <bool name="wantsFocusModes">true</bool>
</resources>
diff --git a/rootdir/fstab.smdk4210 b/rootdir/fstab.smdk4210
index e3fd2e4..4f15fdb 100755
--- a/rootdir/fstab.smdk4210
+++ b/rootdir/fstab.smdk4210
@@ -11,9 +11,9 @@
/dev/block/mmcblk0p12 /preload ext4 noatime,nosuid,nodev,journal_async_commit wait
# vold-managed volumes ("block device" is actually a sysfs devpath)
-/devices/platform/dw_mmc/mmc_host/mmc0/mmc0 /storage/sdcard0 auto defaults voldmanaged=sdcard0:11,nonremovable
-/devices/platform/s3c-sdhci.2/mmc_host/mmc1 /storage/sdcard1 auto defaults voldmanaged=sdcard1:auto
-/devices/platform/s3c_otghcd/usb /storage/usbdisk0 auto defaults voldmanaged=usbdisk0:auto
+/devices/platform/dw_mmc/mmc_host/mmc0/mmc0 auto auto defaults voldmanaged=sdcard0:11,nonremovable,noemulatedsd
+/devices/platform/s3c-sdhci.2/mmc_host/mmc1 auto auto defaults voldmanaged=sdcard1:auto
+/devices/platform/s3c_otghcd/usb auto auto defaults voldmanaged=usbdisk0:auto
# recovery
/dev/block/mmcblk0p5 /boot emmc defaults recoveryonly
diff --git a/rootdir/init.smdk4210.rc b/rootdir/init.smdk4210.rc
index 741bc54..0a5ef4e 100644
--- a/rootdir/init.smdk4210.rc
+++ b/rootdir/init.smdk4210.rc
@@ -4,10 +4,15 @@ import init.gps.rc
on init
export EXTERNAL_STORAGE /storage/sdcard0
export SECONDARY_STORAGE /storage/sdcard1
- mkdir /storage 0775 system system
- mkdir /storage/sdcard0 0775 system system
- mkdir /storage/sdcard1 0775 system system
- mkdir /storage/usbdisk0 0775 system system
+
+ mkdir /mnt/media_rw/sdcard0 0700 media_rw media_rw
+ mkdir /mnt/media_rw/sdcard1 0700 media_rw media_rw
+ mkdir /mnt/media_rw/usbdisk0 0700 media_rw media_rw
+
+ mkdir /storage/sdcard0 0770 root root
+ mkdir /storage/sdcard1 0770 root root
+ mkdir /storage/usbdisk0 0770 root root
+
mkdir /efs 0771 radio system
mkdir /preload 0771 system system
mkdir /mnt 0775 root system
@@ -395,9 +400,9 @@ service iprenew_p2p /system/bin/dhcpcd -n
oneshot
service iprenew_bnep0 /system/bin/dhcpcd -n
- class main
- disabled
- oneshot
+ class main
+ disabled
+ oneshot
# bluetooth mac address
service bdaddr /system/bin/bdaddr_read
@@ -412,3 +417,15 @@ service bugreport /system/bin/bugmailer.sh -v
disabled
oneshot
keycodes 114 115 116
+
+service fuse_sdcard0 /system/bin/sdcard -u 1023 -g 1023 -d /mnt/media_rw/sdcard0 /storage/sdcard0
+ class late_start
+ disabled
+
+service fuse_sdcard1 /system/bin/sdcard -u 1023 -g 1023 -d /mnt/media_rw/sdcard1 /storage/sdcard1
+ class late_start
+ disabled
+
+service fuse_usbdisk0 /system/bin/sdcard -u 1023 -g 1023 -d /mnt/media_rw/usbdisk0 /storage/usbdisk0
+ class late_start
+ disabled
generated by cgit v1.1 at 2024-06-10 20:36:26 +0000