Navigation Menu

Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/ics' into b2g
Browse files Browse the repository at this point in the history 
Conflicts:
	BoardConfig.mk
  • Loading branch information
Daz Jones committed May 2, 2013
2 parents 6b59746 + 50d2a14 commit 2992642
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 60 deletions.
2 changes: 0 additions & 2 deletions BoardConfig.mk
View file
Expand Up @@ -24,8 +24,6 @@ COMMON_GLOBAL_CFLAGS += -DQCOM_HARDWARE
TARGET_GLOBAL_CFLAGS += -mfpu=neon -mfloat-abi=softfp
TARGET_GLOBAL_CPPFLAGS += -mfpu=neon -mfloat-abi=softfp

WITH_JIT := true

# Optimisations used by Qualcomm
TARGET_CORTEX_CACHE_LINE_32 := true
TARGET_USE_SPARROW_BIONIC_OPTIMIZATION := true
Expand Down
22 changes: 22 additions & 0 deletions configs/libcm.sh
View file
@@ -0,0 +1,22 @@
#!/system/bin/sh

# Determined by arch/arm/mach-msm/hardware_self_adapt.c
cat /proc/app_info | grep -A1 "framebuffer_boosted:" | grep -q "1"
boosted=$?

mount -o remount,rw /system

if [ -f /system/lib/libcm.so ]; then
rm /system/lib/libcm.so
fi

# Link the correct libcm.so to /system/lib/libcm.so depending on framebuffer memory
# (which can be used to determine the baseband early on).
if [ $boosted == 0 ]; then
ln -s /system/lib/109808/libcm.so /system/lib/libcm.so
mount -o remount,ro /system
exit 0
fi

ln -s /system/lib/2030/libcm.so /system/lib/libcm.so
mount -o remount,ro /system
1 change: 1 addition & 0 deletions device.mk
View file
Expand Up @@ -72,6 +72,7 @@ PRODUCT_COPY_FILES += \
device/huawei/u8815/configs/AudioFilter.csv:system/etc/AudioFilter.csv \
device/huawei/u8815/configs/AutoVolumeControl.txt:system/etc/AutoVolumeControl.txt \
device/huawei/u8815/configs/media_profiles.xml:system/etc/media_profiles.xml \
device/huawei/u8815/configs/libcm.sh:system/etc/libcm.sh \
device/huawei/u8815/configs/vold.fstab:system/etc/vold.fstab

PRODUCT_COPY_FILES += \
Expand Down
24 changes: 12 additions & 12 deletions overlay/frameworks/base/core/res/res/values/config.xml
View file
Expand Up @@ -114,7 +114,7 @@
<bool name="config_automatic_brightness_available">true</bool>

<!-- If this is true, the screen will come on when you unplug usb/power/whatever. -->
<bool name="config_unplugTurnsOnScreen">false</bool>
<bool name="config_unplugTurnsOnScreen">true</bool>

<!-- If this is true, the screen will fade off. -->
<bool name="config_animateScreenLights">false</bool>
Expand Down Expand Up @@ -142,11 +142,11 @@
Must be overridden in platform specific overlays -->
<integer-array name="config_autoBrightnessLevels">
<item>100</item>
<item>200</item>
<item>400</item>
<item>1000</item>
<item>3000</item>
<item>225</item>
<item>320</item>
<item>1280</item>
<item>2600</item>
<item>10240</item>
</integer-array>

<!-- Minimum screen brightness allowed by the power manager. -->
Expand All @@ -157,11 +157,11 @@
than the size of the config_autoBrightnessLevels array.
This must be overridden in platform specific overlays -->
<integer-array name="config_autoBrightnessLcdBacklightValues">
<item>30</item>
<item>55</item>
<item>150</item>
<item>150</item>
<item>150</item>
<item>20</item>
<item>50</item>
<item>80</item>
<item>145</item>
<item>200</item>
<item>255</item>
</integer-array>

Expand All @@ -176,7 +176,7 @@
<integer-array name="config_autoBrightnessButtonBacklightValues">
<item>255</item>
<item>255</item>
<item>0</item>
<item>255</item>
<item>0</item>
<item>0</item>
<item>0</item>
Expand Down
7 changes: 7 additions & 0 deletions overlay/packages/apps/Settings/res/values/config.xml
View file
Expand Up @@ -19,4 +19,11 @@
<!-- LED Flashlight -->
<bool name="has_led_flash">true</bool>

<!-- Show Expanded Desktop preference -->
<bool name="config_show_expandedDesktop">true</bool>

<!-- Volume Rocker Wake Support. Some devices do not support (PMU) this.
Setting to false will disable Volume Rocker Wake support -->
<bool name="config_show_volumeRockerWake">true</bool>

</resources>
52 changes: 6 additions & 46 deletions ramdisk/init.huawei.rc
View file
Expand Up @@ -103,15 +103,6 @@ on boot
chown system system /sys/devices/platform/msm_hsusb/gadget/sdstatus
chown system system /sys/devices/platform/msm_hsusb/gadget/switchusb
chown system system /sys/devices/platform/msm_hsusb/gadget/fixusb

setprop net.tcp.buffersize.hsupa 4094,87380,1220608,4096,16384,1220608
setprop net.tcp.buffersize.hsdpa 4094,87380,1220608,4096,16384,1220608
setprop net.tcp.buffersize.evdo_b 4094,87380,262144,4096,16384,262144

# Assign TCP buffer thresholds to be ceiling value of technology maximums
# Increased technology maximums should be reflected here.
write /proc/sys/net/core/rmem_max 1220608
write /proc/sys/net/core/wmem_max 1220608

on emmc-fs
# mount mmc partitions
Expand All @@ -134,6 +125,8 @@ on emmc-fs
# Imported from init.msm7627a.rc
write /sys/module/block2mtd/parameters/block2mtd /dev/block/mmcblk0p17

start libcm_link

# msm specific files that need to be created on /data
on post-fs-data
mkdir /data/misc/bluetooth 0770 bluetooth bluetooth
Expand Down Expand Up @@ -219,19 +212,14 @@ service port-bridge /system/bin/port-bridge /dev/smd0 /dev/ttyGS0
group system inet
disabled

on property:ro.baseband="msm"
start port-bridge
# Enable BT-DUN only for all msms
setprop ro.qualcomm.bluetooth.dun true

on property:ro.baseband="unknown"
start port-bridge
service libcm_link /system/bin/sh /system/etc/libcm.sh
user root
disabled
oneshot

on property:wlan.driver.status=loading
start setmac

service pcm-bridge /system/bin/pcm-bridge /dev/smd7 /dev/ttyGS1

service qmuxd /system/bin/qmuxd
class main
user radio
Expand Down Expand Up @@ -321,34 +309,6 @@ service hostapd /system/bin/hostapd -dddd /data/hostapd/hostapd.conf
oneshot
disabled

service ftp /system/bin/sdptool add --psm=5257 --channel=20 FTP
class main
user bluetooth
group bluetooth net_bt_admin
disabled
oneshot

service map0 /system/bin/sdptool add --channel=16 MAS0
class main
user bluetooth
group bluetooth net_bt_admin
disabled
oneshot

service map1 /system/bin/sdptool add --channel=17 MAS1
class main
user bluetooth
group bluetooth net_bt_admin
disabled
oneshot

# compcache - handle at boot
service compcache /system/bin/handle_compcache
class main
user root
group root
disabled

on property:persist.service.zram=10
start compcache

Expand Down
3 changes: 3 additions & 0 deletions system.prop
View file
Expand Up @@ -22,6 +22,9 @@ ro.confg.hw_appfsversion=U8815VCM9_SYSIMG
ro.confg.hw_appsbootversion=U8815VCM9_APPSBOOT
ro.confg.hw_appversion=U8815VCM9_KERNEL

# Memory
sys.mem.max_hidden_apps=10

# Qualcomm
com.qc.hardware=true
debug.composition.7x27A.type=mdp
Expand Down

0 comments on commit 2992642

Please sign in to comment.