Permalink
Browse files

Merge remote-tracking branch 'pershoot/jellybean' into ics

Conflicts:
	init.p3.rc
	overlay/frameworks/base/core/res/res/values/config.xml
	p4-common.mk
	vold.fstab

Signed-off-by: KhasMek <Boushh@gmail.com>
  • Loading branch information...
KhasMek committed Jul 27, 2012
2 parents 45a3219 + 0216b46 commit 9bf537554bee675c28a848b1bae0bc43ac243a03
View
@@ -17,6 +17,7 @@
# This variable is set first, so it can be overridden
# by BoardConfigVendor.mk
BOARD_USES_GENERIC_AUDIO := false
+BOARD_USES_LIBSECRIL_STUB := true
USE_CAMERA_STUB := false
TARGET_OTA_ASSERT_SKIP := true
@@ -47,8 +48,6 @@ BOARD_EGL_CFG := device/samsung/p4-common/egl.cfg
#BOARD_USES_OVERLAY := true
USE_OPENGL_RENDERER := true
-BOARD_USES_AUDIO_LEGACY := true
-
TARGET_RECOVERY_PIXEL_FORMAT := "RGBX_8888"
#TARGET_RECOVERY_UI_LIB := librecovery_ui_ventana
View
@@ -0,0 +1,9 @@
+# format, cameraName=device,direction,orientation,type
+# type can be 'stereo' for stereo capable, 'mono' for not stereo capable,
+# 'usb' to enable searching for a usb device and where to put it in the list
+# if found. Lines must be shorter then 256 characters
+version=1
+camera0=/dev/s5k5ccgx,back,0,mono
+camera1=/dev/s5k5bbgx,front,0,mono
+#camera1=/dev/ov2710,front,0,mono
+#camera4=/dev/ov5650,back,0,stereo // virtual stereo device once supported
View
@@ -0,0 +1,10 @@
+# Android fstab file.
+#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
+# The filesystem that contains the filesystem checker binary (typically /system) cannot
+# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
+
+
+/dev/block/mmcblk0p4 /system ext4 ro wait
+/dev/block/mmcblk0p1 /efs ext4 noatime,nosuid,nodev wait
+/dev/block/mmcblk0p5 /cache ext4 noatime,nosuid,nodev wait,check
+/dev/block/mmcblk0p8 /data ext4 noatime,nosuid,nodev wait,check
View
@@ -4,13 +4,15 @@ on early-init
mount debugfs debugfs /sys/kernel/debug
write /sys/class/firmware/timeout 5
- export EXTERNAL_STORAGE /mnt/sdcard
- mkdir /mnt/sdcard 0000 system system
+ export EXTERNAL_STORAGE /storage/sdcard0
+ mkdir /storage 0050 system sdcard_r
+ mkdir /storage/sdcard0 0000 system system
# for backwards compatibility
- symlink /mnt/sdcard /sdcard
+ symlink /storage/sdcard0 /sdcard
+ symlink /storage/sdcard0 /mnt/sdcard
# create directory for mounting usb drives
- mkdir /mnt/usbdrive 0666 system system
+ mkdir /mnt/usbdrive 0664 system system
symlink /mnt/usbdrive /usbdrive
mkdir /efs 0771 system system
@@ -27,16 +29,14 @@ on init
mkdir /dev/pipes 0771 shell shell
on fs
- mount ext4 /dev/block/mmcblk0p4 /system wait ro
- setprop ro.crypto.tmpfs_options size=128m,mode=0771,uid=1000,gid=1000
- mount ext4 /dev/block/mmcblk0p5 /cache wait noatime nosuid nodev
- exec check_filesystem /dev/block/mmcblk0p8 ext4
- mount ext4 /dev/block/mmcblk0p8 /data wait noatime nosuid nodev discard,noauto_da_alloc
-
- # mound EFS partition
- mount ext4 /dev/block/mmcblk0p1 /efs wait noatime nosuid nodev
+ mount_all /fstab.p3
+ setprop ro.crypto.fuse_sdcard true
on post-fs-data
+ # we will remap this as /storage/sdcard0 with the sdcard fuse tool
+ mkdir /data/media 0770 media_rw media_rw
+ chown media_rw media_rw /data/media
+
chown radio system /efs
chmod 0771 /efs
chmod 0775 /efs/bluetooth
@@ -88,10 +88,6 @@ on post-fs-data
mkdir /data/log 0777 root root
chmod 0777 /data/log
- # we will remap this as /mnt/sdcard with the sdcard fuse tool
- mkdir /data/media 0775 media_rw media_rw
- chown media_rw media_rw /data/media
-
# Set indication (checked by vold) that we have finished this action
setprop vold.post_fs_data_done 1
@@ -185,6 +181,11 @@ on boot
write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor interactive
write /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor interactive
+# Enable KSM
+ write /sys/kernel/mm/ksm/sleep_millisecs 1400
+ write /sys/kernel/mm/ksm/pages_to_scan 200
+ write /sys/kernel/mm/ksm/run 1
+
# HSIC control
chown radio system /sys/devices/platform/tegra-ehci.1/ehci_power
@@ -255,14 +256,29 @@ service drm /system/bin/drmserver
user drm
group system root inet sdcard_rw
+# create virtual SD card at /storage/sdcard0, based on the /data/media directory
+# daemon will drop to user/group system/media_rw after initializing
+# underlying files in /data/media wil be created with user and group media_rw (1023)
+service sdcard /system/bin/sdcard /data/media 1023 1023
+ class late_start
+
+service p2p_supplicant /system/bin/wpa_supplicant \
+ -ieth0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf -N \
+ -ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf \
+ -e/data/misc/wifi/entropy.bin
+ class main
+ socket wpa_eth0 dgram 660 wifi wifi
+ disabled
+ oneshot
+
service wpa_supplicant /system/bin/wpa_supplicant -Dnl80211 -ieth0 \
-c/data/misc/wifi/wpa_supplicant.conf -e/data/misc/wifi/entropy.bin
class main
socket wpa_eth0 dgram 0660 wifi wifi
disabled
oneshot
-service dhcpcd_eth0 /system/bin/dhcpcd -ABKL
+service dhcpcd_eth0 /system/bin/dhcpcd -aABKL
class main
disabled
oneshot
@@ -298,12 +314,6 @@ service gpsd /system/bin/gpsd -c /system/etc/gps.xml
user gps
group system inet
-# create virtual SD card at /mnt/sdcard, based on the /data/media directory
-# daemon will drop to user/group system/media_rw after initializing
-# underlying files in /data/media wil be created with user and group media_rw (1023)
-service sdcard /system/bin/sdcard /data/media 1023 1023
- class late_start
-
service hciattach /system/bin/brcm_patchram_plus --enable_hci --enable_lpm --no2bytes \
--use_baudrate_for_download --baudrate 3000000 --patchram /etc/firmware/bcm4330B1.hcd /dev/ttyHS2
class main
View
@@ -1,79 +1,79 @@
on init
- write /sys/class/android_usb/android0/iSerial $ro.serialno
+ write /sys/class/android_usb/android0/iSerial ${ro.serialno}
write /sys/class/android_usb/android0/f_rndis/manufacturer Samsung
write /sys/class/android_usb/android0/f_rndis/vendorID 04e8
write /sys/class/android_usb/android0/f_rndis/wceis 1
on boot
- write /sys/class/android_usb/android0/iManufacturer $ro.product.manufacturer
- write /sys/class/android_usb/android0/iProduct $ro.product.model
+ write /sys/class/android_usb/android0/iManufacturer ${ro.product.manufacturer}
+ write /sys/class/android_usb/android0/iProduct ${ro.product.model}
on property:sys.usb.config=mtp
write /sys/class/android_usb/android0/enable 0
write /sys/class/android_usb/android0/idVendor 04e8
write /sys/class/android_usb/android0/idProduct 685c
- write /sys/class/android_usb/android0/functions $sys.usb.config
+ write /sys/class/android_usb/android0/functions ${sys.usb.config}
write /sys/class/android_usb/android0/enable 1
- setprop sys.usb.state $sys.usb.config
+ setprop sys.usb.state ${sys.usb.config}
on property:sys.usb.config=adb
write /sys/class/android_usb/android0/enable 0
write /sys/class/android_usb/android0/idVendor 04e8
write /sys/class/android_usb/android0/idProduct 6860
- write /sys/class/android_usb/android0/functions $sys.usb.config
+ write /sys/class/android_usb/android0/functions ${sys.usb.config}
write /sys/class/android_usb/android0/enable 1
start adbd
- setprop sys.usb.state $sys.usb.config
+ setprop sys.usb.state ${sys.usb.config}
on property:sys.usb.config=mtp,adb
write /sys/class/android_usb/android0/enable 0
write /sys/class/android_usb/android0/idVendor 04e8
write /sys/class/android_usb/android0/idProduct 6860
- write /sys/class/android_usb/android0/functions $sys.usb.config
+ write /sys/class/android_usb/android0/functions ${sys.usb.config}
write /sys/class/android_usb/android0/enable 1
start adbd
- setprop sys.usb.state $sys.usb.config
+ setprop sys.usb.state ${sys.usb.config}
on property:sys.usb.config=rndis
write /sys/class/android_usb/android0/enable 0
write /sys/class/android_usb/android0/idVendor 04e8
write /sys/class/android_usb/android0/idProduct 6863
- write /sys/class/android_usb/android0/functions $sys.usb.config
+ write /sys/class/android_usb/android0/functions ${sys.usb.config}
write /sys/class/android_usb/android0/bDeviceClass 224
write /sys/class/android_usb/android0/enable 1
- setprop sys.usb.state $sys.usb.config
+ setprop sys.usb.state ${sys.usb.config}
on property:sys.usb.config=rndis,adb
write /sys/class/android_usb/android0/enable 0
write /sys/class/android_usb/android0/idVendor 04e8
write /sys/class/android_usb/android0/idProduct 6864
- write /sys/class/android_usb/android0/functions $sys.usb.config
+ write /sys/class/android_usb/android0/functions ${sys.usb.config}
write /sys/class/android_usb/android0/bDeviceClass 224
write /sys/class/android_usb/android0/enable 1
start adbd
- setprop sys.usb.state $sys.usb.config
+ setprop sys.usb.state ${sys.usb.config}
on property:sys.usb.config=ptp
write /sys/class/android_usb/android0/enable 0
write /sys/class/android_usb/android0/idVendor 04e8
write /sys/class/android_usb/android0/idProduct 6865
- write /sys/class/android_usb/android0/functions $sys.usb.config
+ write /sys/class/android_usb/android0/functions ${sys.usb.config}
write /sys/class/android_usb/android0/enable 1
- setprop sys.usb.state $sys.usb.config
+ setprop sys.usb.state ${sys.usb.config}
on property:sys.usb.config=ptp,adb
write /sys/class/android_usb/android0/enable 0
write /sys/class/android_usb/android0/idVendor 04e8
write /sys/class/android_usb/android0/idProduct 6866
- write /sys/class/android_usb/android0/functions $sys.usb.config
+ write /sys/class/android_usb/android0/functions ${sys.usb.config}
write /sys/class/android_usb/android0/enable 1
start adbd
- setprop sys.usb.state $sys.usb.config
+ setprop sys.usb.state ${sys.usb.config}
on property:sys.usb.config=rndis,dm
write /sys/class/android_usb/android0/enable 0
write /sys/class/android_usb/android0/idVendor 04e8
write /sys/class/android_usb/android0/idProduct 6862
- write /sys/class/android_usb/android0/functions $sys.usb.config
+ write /sys/class/android_usb/android0/functions ${sys.usb.config}
write /sys/class/android_usb/android0/enable 1
- setprop sys.usb.state $sys.usb.config
+ setprop sys.usb.state ${sys.usb.config}
@@ -119,7 +119,7 @@ key 96 NUMPAD_ENTER
key 97 CTRL_RIGHT
key 98 NUMPAD_DIVIDE
key 99 SYSRQ
-key 100 ALT_GR
+key 100 ALT_RIGHT
# key 101 "KEY_LINEFEED"
key 102 MOVE_HOME
key 103 DPAD_UP
@@ -175,7 +175,7 @@ key 150 EXPLORER
key 152 POWER WAKE
# key 153 "KEY_DIRECTION"
# key 154 "KEY_CYCLEWINDOWS"
-key 155 EMAIL
+key 155 ENVELOPE
key 156 BOOKMARK
# key 157 "KEY_COMPUTER"
key 158 BACK WAKE_DROPPED
@@ -244,8 +244,8 @@ key 217 SEARCH
# key 221 "KEY_SHOP"
# key 222 "KEY_ALTERASE"
# key 223 "KEY_CANCEL"
-key 224 BRIGHTNESS_DOWN
-key 225 BRIGHTNESS_UP
+#key 224 BRIGHTNESS_DOWN
+#key 225 BRIGHTNESS_UP
key 226 HEADSETHOOK
key 227 STAR
key 228 POUND
@@ -297,7 +297,7 @@ key 362 GUIDE
key 366 DVR
# key 367 "KEY_MHP"
# key 368 "KEY_LANGUAGE"
-key 368 LANG
+#key 368 LANG
# key 369 "KEY_TITLE"
# key 370 "KEY_SUBTITLE"
# key 371 "KEY_ANGLE"
@@ -386,8 +386,8 @@ key 484 B FUNCTION
# key 504 KEY_BRL_DOT8
-key 704 RECENTAPPS
-key 705 APPLICATION
-key 706 SIP_ON_OFF
-key 707 VOICESEARCH
-key 708 QPANEL_ON_OFF
+key 704 APP_SWITCH
+#key 705 APPLICATION
+#key 706 SIP_ON_OFF
+#key 707 VOICESEARCH
+#key 708 QPANEL_ON_OFF
View
@@ -1,11 +1,11 @@
key 158 BACK WAKE_DROPPED
key 359 HOME WAKE_DROPPED
-key 61 RECENTAPPS WAKE_DROPPED
+key 61 APP_SWITCH WAKE_DROPPED
key 150 EXPLORER WAKE_DROPPED
-key 215 EMAIL WAKE_DROPPED
+key 215 ENVELOPE WAKE_DROPPED
key 152 POWER WAKE_DROPPED
-key 224 BRIGHTNESS_DOWN WAKE_DROPPED
-key 225 BRIGHTNESS_UP WAKE_DROPPED
+#key 224 BRIGHTNESS_DOWN WAKE_DROPPED
+#key 225 BRIGHTNESS_UP WAKE_DROPPED
key 113 MUTE WAKE_DROPPED
key 114 VOLUME_DOWN WAKE_DROPPED
key 115 VOLUME_UP WAKE_DROPPED
@@ -14,7 +14,7 @@ key 168 MEDIA_REWIND WAKE_DROPPED
key 208 MEDIA_FAST_FORWARD WAKE_DROPPED
key 163 MEDIA_NEXT WAKE_DROPPED
key 165 MEDIA_PREVIOUS WAKE_DROPPED
-key 185 APPLICATION WAKE_DROPPED
+#key 185 APPLICATION WAKE_DROPPED
key 139 MENU WAKE_DROPPED
key 111 FORWARD_DEL WAKE_DROPPED
@@ -48,7 +48,7 @@ key 26 LEFT_BRACKET WAKE_DROPPED
key 27 RIGHT_BRACKET WAKE_DROPPED
key 43 BACKSLASH WAKE_DROPPED
-key 58 CAPSLOCK WAKE_DROPPED
+key 58 CAPS_LOCK WAKE_DROPPED
key 30 A WAKE_DROPPED
key 31 S WAKE_DROPPED
key 32 D WAKE_DROPPED
@@ -77,13 +77,13 @@ key 53 SLASH WAKE_DROPPED
key 54 SHIFT_RIGHT WAKE_DROPPED
key 29 CTRL_LEFT WAKE_DROPPED
-key 187 SIP_ON_OFF WAKE_DROPPED
+#key 187 SIP_ON_OFF WAKE_DROPPED
key 217 SEARCH WAKE_DROPPED
-key 190 VOICESEARCH WAKE_DROPPED
+#key 190 VOICESEARCH WAKE_DROPPED
key 57 SPACE WAKE_DROPPED
-key 191 LANG WAKE_DROPPED
-key 192 QPANEL_ON_OFF WAKE_DROPPED
-key 100 ALT_GR WAKE_DROPPED
+#key 191 LANG WAKE_DROPPED
+#key 192 QPANEL_ON_OFF WAKE_DROPPED
+key 100 ALT_RIGHT WAKE_DROPPED
key 108 DPAD_DOWN WAKE_DROPPED
key 103 DPAD_UP WAKE_DROPPED
View
@@ -0,0 +1,37 @@
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES:= \
+ AudioHardware.cpp
+
+LOCAL_MODULE := audio.primary.p3
+LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_STATIC_LIBRARIES:= libmedia_helper
+LOCAL_SHARED_LIBRARIES:= \
+ libutils \
+ libhardware_legacy \
+ libtinyalsa \
+ libaudioutils
+
+LOCAL_WHOLE_STATIC_LIBRARIES := libaudiohw_legacy
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SHARED_LIBRARIES += libdl
+LOCAL_C_INCLUDES += \
+ external/tinyalsa/include \
+ $(call include-path-for, audio-effects) \
+ $(call include-path-for, audio-utils)
+
+include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := AudioPolicyManager.cpp
+LOCAL_SHARED_LIBRARIES := libcutils libutils
+LOCAL_STATIC_LIBRARIES := libmedia_helper
+LOCAL_WHOLE_STATIC_LIBRARIES := libaudiopolicy_legacy
+LOCAL_MODULE := audio_policy.p3
+LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_SHARED_LIBRARY)
Oops, something went wrong.

0 comments on commit 9bf5375

Please sign in to comment.