Merge branch 'gingerbread' of github.com:/CyanogenMod/android_device_samsung_c1-common into HEAD

This commit is contained in:
Kolja Dummann 2011-06-19 09:59:54 +02:00
commit a217cdb9d6
22 changed files with 1552 additions and 614 deletions

File diff suppressed because it is too large Load Diff

View File

@ -539,8 +539,6 @@ on boot
chown radio system /sys/class/jack/jack_selector/select_jack
#bluetooth
setprop ro.bt.bdaddr_path "/efs/bluetooth/bt_addr"
chown bluetooth bluetooth ro.bt.bdaddr_path
chown bluetooth bluetooth /dev/s3c2410_serial0
chmod 0660 /dev/s3c2410_serial0
chmod 0660 /sys/class/rfkill/rfkill0/state
@ -667,8 +665,8 @@ service dbus /system/bin/dbus-daemon --system --nofork
user bluetooth
group bluetooth net_bt_admin
service hciattach /system/bin/brcm_patchram_plus --enable_hci --enable_lpm \
--baudrate 3000000 --patchram /system/vendor/firmware/bcm4330.hcd /dev/s3c2410_serial0
service hciattach /system/bin/hciattach /dev/s3c2410_serial0 any
# service hciattach /system/bin/brcm_patchram_plus --enable_hci --enable_lpm --baudrate 3000000 --patchram /system/vendor/firmware/bcm4330.hcd /dev/s3c2410_serial0
user bluetooth
group bluetooth net_bt_admin
disabled

View File

@ -23,6 +23,7 @@
#include <unistd.h>
#include <dlfcn.h>
#define LOG_NDEBUG 0
#define LOG_TAG "ALSAControl"
#include <utils/Log.h>
#include <utils/String8.h>

View File

@ -23,6 +23,7 @@
#include <unistd.h>
#include <dlfcn.h>
#define LOG_NDEBUG 0
#define LOG_TAG "AudioHardwareALSA"
#include <utils/Log.h>
#include <utils/String8.h>
@ -65,15 +66,15 @@ struct alsa_properties_t
static alsa_properties_t
mixerMasterProp[SND_PCM_STREAM_LAST+1] =
ALSA_PROP(AudioSystem::DEVICE_OUT_ALL, "master", "PCM", "Capture");
ALSA_PROP(AudioSystem::DEVICE_OUT_ALL, "master", "Master", NULL);
static alsa_properties_t
mixerProp[][SND_PCM_STREAM_LAST+1] = {
ALSA_PROP(AudioSystem::DEVICE_OUT_EARPIECE, "earpiece", "Earpiece", "Capture"),
ALSA_PROP(AudioSystem::DEVICE_OUT_SPEAKER, "speaker", "Speaker", ""),
ALSA_PROP(AudioSystem::DEVICE_OUT_WIRED_HEADSET, "headset", "Headphone", "Capture"),
ALSA_PROP(AudioSystem::DEVICE_OUT_BLUETOOTH_SCO, "bluetooth.sco", "Bluetooth", "Bluetooth Capture"),
ALSA_PROP(AudioSystem::DEVICE_OUT_BLUETOOTH_A2DP, "bluetooth.a2dp", "Bluetooth A2DP", "Bluetooth A2DP Capture"),
ALSA_PROP(AudioSystem::DEVICE_OUT_EARPIECE, "earpiece", "Voice", NULL),
ALSA_PROP(AudioSystem::DEVICE_OUT_SPEAKER, "speaker", "Speaker", NULL),
ALSA_PROP(AudioSystem::DEVICE_OUT_WIRED_HEADSET, "headset", "Headphone", NULL),
ALSA_PROP(AudioSystem::DEVICE_OUT_BLUETOOTH_SCO, "bluetooth.sco", "Bluetooth", NULL),
ALSA_PROP(AudioSystem::DEVICE_OUT_BLUETOOTH_A2DP, "bluetooth.a2dp", "Bluetooth A2DP", NULL),
ALSA_PROP(static_cast<AudioSystem::audio_devices>(0), "", NULL, NULL)
};
@ -161,8 +162,8 @@ ALSAMixer::ALSAMixer()
{
int err;
initMixer (&mMixer[SND_PCM_STREAM_PLAYBACK], "AndroidPlayback");
initMixer (&mMixer[SND_PCM_STREAM_CAPTURE], "AndroidCapture");
initMixer (&mMixer[SND_PCM_STREAM_PLAYBACK], "mc1n2");
initMixer (&mMixer[SND_PCM_STREAM_CAPTURE], "mc1n2");
snd_mixer_selem_id_t *sid;
snd_mixer_selem_id_alloca(&sid);

View File

@ -23,6 +23,7 @@
#include <unistd.h>
#include <dlfcn.h>
#define LOG_NDEBUG 0
#define LOG_TAG "AudioHardwareALSA"
#include <utils/Log.h>
#include <utils/String8.h>

View File

@ -23,6 +23,7 @@
#include <unistd.h>
#include <dlfcn.h>
#define LOG_NDEBUG 0
#define LOG_TAG "AudioHardwareALSA"
#include <utils/Log.h>
#include <utils/String8.h>

View File

@ -14,8 +14,8 @@
* limitations under the License.
*/
#define LOG_NDEBUG 0
#define LOG_TAG "AudioPolicyManagerALSA"
//#define LOG_NDEBUG 0
#include <utils/Log.h>
#include "AudioPolicyManagerALSA.h"
#include <media/mediarecorder.h>

View File

@ -23,6 +23,7 @@
#include <unistd.h>
#include <dlfcn.h>
#define LOG_NDEBUG 0
#define LOG_TAG "AudioHardwareALSA"
#include <utils/Log.h>
#include <utils/String8.h>

View File

@ -24,6 +24,7 @@
#include <dlfcn.h>
#include <sys/time.h>
#define LOG_NDEBUG 0
#define LOG_TAG "AudioHardwareALSA"
#include <utils/Log.h>
#include <utils/String8.h>

View File

@ -15,6 +15,7 @@
** limitations under the License.
*/
#define LOG_NDEBUG 0
#define LOG_TAG "AcousticsModule"
#include <utils/Log.h>

View File

@ -15,6 +15,7 @@
** limitations under the License.
*/
#define LOG_NDEBUG 0
#define LOG_TAG "ALSAModule"
#include <utils/Log.h>
@ -239,7 +240,7 @@ status_t setHardwareParams(alsa_handle_t *handle)
goto done;
}
LOGV("Set %s PCM format to %s (%s)", streamName(), formatName, formatDesc);
LOGV("Set %s PCM format to %s (%s)", streamName(handle), formatName, formatDesc);
err = snd_pcm_hw_params_set_channels(handle->handle, hardwareParams,
handle->channels);
@ -250,7 +251,7 @@ status_t setHardwareParams(alsa_handle_t *handle)
}
LOGV("Using %i %s for %s.", handle->channels,
handle->channels == 1 ? "channel" : "channels", streamName());
handle->channels == 1 ? "channel" : "channels", streamName(handle));
err = snd_pcm_hw_params_set_rate_near(handle->handle, hardwareParams,
&requestedRate, 0);
@ -265,7 +266,7 @@ status_t setHardwareParams(alsa_handle_t *handle)
LOGW("Requested rate (%u HZ) does not match actual rate (%u HZ)",
handle->sampleRate, requestedRate);
else
LOGV("Set %s sample rate to %u HZ", stream, requestedRate);
LOGV("Set %s sample rate to %u HZ", streamName(handle), requestedRate);
#ifdef DISABLE_HARWARE_RESAMPLING
// Disable hardware re-sampling.

View File

@ -1,26 +0,0 @@
<!--
/* //device/apps/common/assets/res/any/colors.xml
**
** Copyright 2006, 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.
*/
-->
<!-- Defines the shutdown options shown in the reboot dialog. -->
<resources>
<array name="shutdown_reboot_options">
<item>Neu starten</item>
<item>Recovery</item>
</array>
</resources>

View File

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/* //device/apps/common/assets/res/any/colors.xml
**
** Copyright 2006, Google Inc.
**
** 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.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Defines the shutdown options shown in the reboot dialog. -->
<array name="shutdown_reboot_options">
<item>Käynnistä uudelleen</item>
<item>Recovery</item>
</array>
</resources>

View File

@ -1,25 +0,0 @@
<!--
/* //device/apps/common/assets/res/any/colors.xml
**
** Copyright 2006, 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.
*/
-->
<resources>
<!-- Defines the shutdown options shown in the reboot dialog. -->
<array name="shutdown_reboot_options">
<item>Redémarrage</item>
<item>Recovery</item>
</array>
</resources>

View File

@ -1,31 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/* //device/apps/common/assets/res/any/colors.xml
**
** Copyright 2006, 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.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Defines the shutdown options shown in the reboot dialog. -->
<array name="shutdown_reboot_options">
<item>Riavvia</item>
<item>Recovery</item>
</array>
</resources>

View File

@ -1,36 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/* //device/apps/common/assets/res/any/colors.xml
**
** Copyright 2006, Google Inc.
**
** 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.
*/
-->
<resources>
<!-- Do not translate. -->
<integer-array name="maps_starting_lat_lng">
<item>-22863878</item>
<item>-43244097</item>
</integer-array>
<!-- Do not translate. -->
<integer-array name="maps_starting_zoom">
<item>3</item>
</integer-array>
<array name="shutdown_reboot_options">
<item>Reiniciar</item>
<item>Recuperação</item>
</array>
</resources>

View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<array name="shutdown_reboot_options">
<item>Перезагрузить</item>
<item>Recovery</item>
</array>
</resources>

View File

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/* //device/apps/common/assets/res/any/colors.xml
**
** Copyright 2006, 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.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Defines the shutdown options shown in the reboot dialog. -->
<array name="shutdown_reboot_options">
<item>Omstart</item>
<item>Recovery</item>
</array>
</resources>

View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<array name="shutdown_reboot_options">
<item>Перезавантажити</item>
<item>Реж. відновлення</item>
</array>
</resources>

View File

@ -1,39 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/* //device/apps/common/assets/res/any/colors.xml
**
** Copyright 2006, Google Inc.
**
** 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.
*/
-->
<resources>
<!-- Do not translate. -->
<integer-array name="maps_starting_lat_lng">
<item>25022112</item>
<item>121478019</item>
</integer-array>
<!-- Do not translate. -->
<integer-array name="maps_starting_zoom">
<item>3</item>
</integer-array>
<!-- Defines the shutdown options shown in the reboot dialog. -->
<array name="shutdown_reboot_options">
<item>重新開機</item>
<item>Recovery</item>
</array>
</resources>

View File

@ -1,125 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/* //device/apps/common/assets/res/any/colors.xml
**
** Copyright 2006, 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.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Do not translate. These are all of the drawable resources that should be preloaded by
the zygote process before it starts forking application processes. -->
<array name="preloaded_drawables">
<item>@drawable/sym_def_app_icon</item>
<item>@drawable/arrow_down_float</item>
<item>@drawable/btn_check</item>
<item>@drawable/btn_check_label_background</item>
<item>@drawable/btn_check_off</item>
<item>@drawable/btn_check_on</item>
<item>@drawable/btn_default</item>
<item>@drawable/btn_default_small</item>
<item>@drawable/btn_dropdown</item>
<item>@drawable/btn_plus</item>
<item>@drawable/btn_minus</item>
<item>@drawable/btn_radio</item>
<item>@drawable/btn_star</item>
<item>@drawable/btn_toggle</item>
<item>@drawable/ic_emergency</item>
<item>@drawable/divider_horizontal_bright</item>
<item>@drawable/divider_horizontal_dark</item>
<item>@drawable/edit_text</item>
<item>@drawable/expander_group</item>
<item>@drawable/list_selector_background</item>
<item>@drawable/menu_background</item>
<item>@drawable/menu_background_fill_parent_width</item>
<item>@drawable/menu_selector</item>
<item>@drawable/panel_background</item>
<item>@drawable/popup_bottom_bright</item>
<item>@drawable/popup_bottom_dark</item>
<item>@drawable/popup_bottom_medium</item>
<item>@drawable/popup_center_bright</item>
<item>@drawable/popup_center_dark</item>
<item>@drawable/popup_full_dark</item>
<item>@drawable/popup_top_bright</item>
<item>@drawable/popup_top_dark</item>
<item>@drawable/progress_horizontal</item>
<item>@drawable/progress_indeterminate_horizontal</item>
<item>@drawable/progress_small</item>
<item>@drawable/progress_small_titlebar</item>
<item>@drawable/screen_background_dark</item>
<item>@drawable/screen_background_light</item>
<item>@drawable/scrollbar_handle_horizontal</item>
<item>@drawable/scrollbar_handle_vertical</item>
<item>@drawable/spinner_dropdown_background</item>
<item>@drawable/text_select_handle_left</item>
<item>@drawable/text_select_handle_middle</item>
<item>@drawable/text_select_handle_right</item>
<item>@drawable/title_bar</item>
<item>@drawable/title_bar_shadow</item>
<!-- Visual lock screen -->
<item>@drawable/indicator_code_lock_drag_direction_green_up</item>
<item>@drawable/indicator_code_lock_drag_direction_red_up</item>
<item>@drawable/indicator_code_lock_point_area_default</item>
<item>@drawable/indicator_code_lock_point_area_green</item>
<item>@drawable/indicator_code_lock_point_area_red</item>
<!-- overscroll -->
<item>@drawable/overscroll_glow</item>
<item>@drawable/overscroll_edge</item>
</array>
<!-- Do not translate. These are all of the color state list resources that should be
preloaded by the zygote process before it starts forking application processes. -->
<array name="preloaded_color_state_lists">
<item>@color/hint_foreground_dark</item>
<item>@color/hint_foreground_light</item>
<item>@color/primary_text_dark</item>
<item>@color/primary_text_dark_disable_only</item>
<item>@color/primary_text_light</item>
<item>@color/primary_text_light_disable_only</item>
<item>@color/primary_text_light_nodisable</item>
<item>@color/secondary_text_dark</item>
<item>@color/secondary_text_light</item>
<item>@color/tab_indicator_text</item>
<item>@color/tertiary_text_dark</item>
<item>@color/tertiary_text_light</item>
<item>#ff000000</item>
<item>#00000000</item>
<item>#ffffffff</item>
</array>
<!-- Do not translate. -->
<integer-array name="maps_starting_lat_lng">
<item>36149777</item>
<item>-95993398</item>
</integer-array>
<!-- Do not translate. -->
<integer-array name="maps_starting_zoom">
<item>3</item>
</integer-array>
<!-- Defines the shutdown options shown in the reboot dialog. -->
<array name="shutdown_reboot_options">
<item>Reboot</item>
<item>Recovery</item>
</array>
<!-- Do not translate. Defines the shutdown actions passed to the kernel.
The first item should be empty for regular reboot. -->
<string-array name="shutdown_reboot_actions">
<item></item>
<item>recovery</item>
</string-array>
</resources>

View File

@ -1,87 +1,12 @@
/dev/null 0666 root root
/dev/zero 0666 root root
/dev/full 0666 root root
/dev/ptmx 0666 root root
/dev/tty 0666 root root
/dev/random 0666 root root
/dev/urandom 0666 root root
/dev/ashmem 0666 root root
/dev/binder 0666 root root
# video
/dev/video14 0660 system system
/dev/video21 0660 system system
/dev/pmem_gpu1 0660 system graphics
# logger should be world writable (for logging) but not readable
/dev/log/* 0662 root log
# the msm hw3d client device node is world writable/readable.
/dev/msm_hw3dc 0666 root root
# gpu driver for adreno200 is globally accessible
/dev/kgsl 0666 root root
# these should not be world writable
/dev/diag 0660 radio radio
/dev/diag_arm9 0660 radio radio
/dev/android_adb 0660 adb adb
/dev/android_adb_enable 0660 adb adb
/dev/ttyMSM0 0600 bluetooth bluetooth
/dev/ttyHS0 0600 bluetooth bluetooth
/dev/uinput 0660 system bluetooth
/dev/alarm 0664 system radio
/dev/tty0 0660 root system
/dev/graphics/* 0660 root graphics
/dev/msm_hw3dm 0660 system graphics
/dev/input/* 0660 root input
/dev/eac 0660 root audio
/dev/cam 0660 root camera
/dev/pmem_adsp* 0660 system audio
/dev/pmem_camera* 0660 system camera
/dev/oncrpc/* 0660 root system
/dev/adsp/* 0660 system audio
/dev/snd/* 0660 system audio
/dev/mt9t013 0660 system system
/dev/msm_camera/* 0660 system system
/dev/akm8976_daemon 0640 compass system
/dev/akm8976_aot 0640 compass system
/dev/akm8973_daemon 0640 compass system
/dev/akm8973_aot 0640 compass system
/dev/bma150 0640 compass system
/dev/cm3602 0640 compass system
/dev/akm8976_pffd 0640 compass system
/dev/lightsensor 0640 system system
/dev/msm_pcm_out* 0660 system audio
/dev/msm_pcm_in* 0660 system audio
/dev/msm_pcm_ctl* 0660 system audio
/dev/msm_snd* 0660 system audio
/dev/msm_mp3* 0660 system audio
/dev/audience_a1026* 0660 system audio
/dev/tpa2018d1* 0660 system audio
/dev/msm_audpre 0660 system audio
/dev/msm_audio_ctl 0660 system audio
/dev/htc-acoustic 0660 system audio
/dev/vdec 0660 system audio
/dev/q6venc 0660 system audio
/dev/snd/dsp 0660 system audio
/dev/snd/dsp1 0660 system audio
/dev/snd/mixer 0660 system audio
/dev/fmradio 0660 system audio
/dev/smd0 0640 radio radio
/dev/qemu_trace 0666 system system
/dev/qmi 0640 radio radio
/dev/qmi0 0640 radio radio
/dev/qmi1 0640 radio radio
/dev/qmi2 0640 radio radio
/dev/bus/usb/* 0660 system usb
# CDMA radio interface MUX
/dev/ts0710mux* 0640 radio radio
/dev/ppp 0660 radio vpn
/dev/tun 0660 vpn vpn
# sysfs properties
/sys/devices/virtual/input/input* enable 0660 root input
/sys/devices/virtual/input/input* poll_delay 0660 root input
/dev/fimg2d 0666 system system
/dev/mali 0666 system system
/dev/ump 0666 system graphics
/dev/s5p-jpeg 0660 system system
/dev/s3c-mfc 0660 system graphics
# camera
/dev/video0 0660 system camera
@ -89,9 +14,6 @@
/dev/video2 0660 system camera
/dev/video3 0660 system camera
# mfc
/dev/s3c-mfc 0660 system graphics
# for usb printer
/dev/usb/lp* 0660 system usb
@ -99,26 +21,23 @@
/dev/i2c-15 0660 system system
/dev/CEC 0660 system system
/dev/HPD 0660 system system
/dev/s5p-jpeg 0660 system system
# for Sensor HAL
/dev/akm8975 0660 system system
/dev/accelerometer 0660 system system
# for bluetooth
/dev/s3c2410_serial0 0660 bluetooth bluetooth
# for gps
/dev/s3c2410_serial1 0660 root system
/dev/tspdrv 0660 shell shell
# for MTP
/dev/usb_mtp_gadget 0660 system system
# added by slsi
/dev/mali 0666 system system
/dev/ump 0666 system graphics
# for ULP Audio
/dev/s5p-rp 0660 system audio
/dev/s5p-rp_ctrl 0660 system audio
/dev/fimg2d 0666 system system
/dev/pmem 0660 system graphics