diff options
-rw-r--r-- | audio/audio_hw.c | 8 | ||||
-rw-r--r-- | bthid.ko | bin | 0 -> 91186 bytes | |||
-rw-r--r-- | device.mk | 3 | ||||
-rw-r--r-- | dumpstate/dumpstate.c | 1 | ||||
-rwxr-xr-x | init.tuna.rc | 5 | ||||
-rw-r--r-- | kernel | bin | 4143008 -> 4143188 bytes | |||
-rw-r--r-- | overlay/frameworks/base/core/res/res/values/config.xml | 2 | ||||
-rw-r--r-- | overlay/packages/apps/Settings/res/values-cs/arrays.xml | 12 | ||||
-rw-r--r-- | overlay/packages/apps/Settings/res/values-fa/arrays.xml | 12 | ||||
-rw-r--r-- | overlay/packages/apps/Settings/res/values-nb/arrays.xml | 8 |
10 files changed, 31 insertions, 20 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 74f2383..8ae519c 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -1142,7 +1142,7 @@ static void select_mode(struct tuna_audio_device *adev) adev->devices &= ~AUDIO_DEVICE_OUT_SPEAKER; select_output_device(adev); start_call(adev); - adev_set_voice_volume(&adev->hw_device, adev->voice_volume); + ril_set_call_volume(&adev->ril, SOUND_TYPE_VOICE, adev->voice_volume); adev->in_call = 1; } } else { @@ -1681,7 +1681,7 @@ static size_t out_get_buffer_size_hdmi(const struct audio_stream *stream) return HDMI_MULTI_PERIOD_SIZE * audio_stream_frame_size((struct audio_stream *)stream); } -static uint32_t out_get_channels(const struct audio_stream *stream) +static audio_channel_mask_t out_get_channels(const struct audio_stream *stream) { struct tuna_stream_out *out = (struct tuna_stream_out *)stream; @@ -2240,7 +2240,7 @@ static size_t in_get_buffer_size(const struct audio_stream *stream) popcount(in->main_channels)); } -static uint32_t in_get_channels(const struct audio_stream *stream) +static audio_channel_mask_t in_get_channels(const struct audio_stream *stream) { struct tuna_stream_in *in = (struct tuna_stream_in *)stream; @@ -3408,11 +3408,13 @@ static int adev_set_voice_volume(struct audio_hw_device *dev, float volume) { struct tuna_audio_device *adev = (struct tuna_audio_device *)dev; + pthread_mutex_lock(&adev->lock); adev->voice_volume = volume; if (adev->mode == AUDIO_MODE_IN_CALL) ril_set_call_volume(&adev->ril, SOUND_TYPE_VOICE, volume); + pthread_mutex_unlock(&adev->lock); return 0; } diff --git a/bthid.ko b/bthid.ko Binary files differnew file mode 100644 index 0000000..a2d82a1 --- /dev/null +++ b/bthid.ko @@ -79,6 +79,9 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ system/bluetooth/data/main.le.conf:system/etc/bluetooth/main.conf +PRODUCT_COPY_FILES += \ + device/samsung/tuna/bthid.ko:system/lib/modules/bthid.ko + # Wifi ifneq ($(TARGET_PREBUILT_WIFI_MODULE),) PRODUCT_COPY_FILES += \ diff --git a/dumpstate/dumpstate.c b/dumpstate/dumpstate.c index 2858b2c..61602e4 100644 --- a/dumpstate/dumpstate.c +++ b/dumpstate/dumpstate.c @@ -38,4 +38,5 @@ void dumpstate_board() dump_file("fsa9480 device_type", "/sys/bus/i2c/drivers/fsa9480/4-0025/device_type"); dump_file("fsa9480 control", "/sys/bus/i2c/drivers/fsa9480/4-0025/control"); dump_file("tiler 2x1 map", "/d/tiler/map/2x1"); + dump_file("wlan", "/sys/module/bcmdhd/parameters/info_string"); }; diff --git a/init.tuna.rc b/init.tuna.rc index 070ab1d..86dec0c 100755 --- a/init.tuna.rc +++ b/init.tuna.rc @@ -46,6 +46,11 @@ on boot write /sys/bus/usb/devices/usb1/power/autosuspend_delay_ms 0 write /sys/bus/usb/devices/usb2/power/autosuspend_delay_ms 0 +# Start kernel driver (for BTHID) + insmod /system/lib/modules/bthid.ko + chmod 0660 /dev/bthid + chown bluetooth bluetooth /dev/bthid + on fs mkdir /factory 0775 radio radio mount_all /fstab.tuna Binary files differdiff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index f85627b..a8e196a 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -213,7 +213,7 @@ bluetooth interfaces. If the device doesn't want to support tethering over bluetooth this should be empty. --> <string-array translatable="false" name="config_tether_bluetooth_regexs"> - <item>"bnep\\d"</item> + <item>"bt-pan"</item> </string-array> <!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering --> diff --git a/overlay/packages/apps/Settings/res/values-cs/arrays.xml b/overlay/packages/apps/Settings/res/values-cs/arrays.xml index 266d10e..265da14 100644 --- a/overlay/packages/apps/Settings/res/values-cs/arrays.xml +++ b/overlay/packages/apps/Settings/res/values-cs/arrays.xml @@ -21,11 +21,11 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="screen_timeout_entries"> - <item msgid="5314770629356662739">"15 s."</item> - <item msgid="8672738773876256432">"30 s."</item> - <item msgid="465923292941002466">"1 min."</item> - <item msgid="7955177189296850016">"2 min."</item> - <item msgid="1244255986255344525">"5 min."</item> - <item msgid="294890536998091748">"10 min."</item> + <item msgid="5314770629356662739">"15 sekund"</item> + <item msgid="8672738773876256432">"30 sekund"</item> + <item msgid="465923292941002466">"1 minuta"</item> + <item msgid="7955177189296850016">"2 minuty"</item> + <item msgid="1244255986255344525">"5 minut"</item> + <item msgid="294890536998091748">"10 minut"</item> </string-array> </resources> diff --git a/overlay/packages/apps/Settings/res/values-fa/arrays.xml b/overlay/packages/apps/Settings/res/values-fa/arrays.xml index bf95ca8..71915a9 100644 --- a/overlay/packages/apps/Settings/res/values-fa/arrays.xml +++ b/overlay/packages/apps/Settings/res/values-fa/arrays.xml @@ -21,11 +21,11 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="screen_timeout_entries"> - <item msgid="5314770629356662739">"15 ثانیه"</item> - <item msgid="8672738773876256432">"30 ثانیه"</item> - <item msgid="465923292941002466">"1 دقیقه"</item> - <item msgid="7955177189296850016">"2 دقیقه"</item> - <item msgid="1244255986255344525">"5 دقیقه"</item> - <item msgid="294890536998091748">"10 دقیقه"</item> + <item msgid="5314770629356662739">"۱۵ ثانیه"</item> + <item msgid="8672738773876256432">"۳۰ ثانیه"</item> + <item msgid="465923292941002466">"۱ دقیقه"</item> + <item msgid="7955177189296850016">"۲ دقیقه"</item> + <item msgid="1244255986255344525">"۵ دقیقه"</item> + <item msgid="294890536998091748">"۱۰ دقیقه"</item> </string-array> </resources> diff --git a/overlay/packages/apps/Settings/res/values-nb/arrays.xml b/overlay/packages/apps/Settings/res/values-nb/arrays.xml index c5db781..a365905 100644 --- a/overlay/packages/apps/Settings/res/values-nb/arrays.xml +++ b/overlay/packages/apps/Settings/res/values-nb/arrays.xml @@ -23,9 +23,9 @@ <string-array name="screen_timeout_entries"> <item msgid="5314770629356662739">"15 sekunder"</item> <item msgid="8672738773876256432">"30 sekunder"</item> - <item msgid="465923292941002466">"Ett minutt"</item> - <item msgid="7955177189296850016">"To minutter"</item> - <item msgid="1244255986255344525">"Fem minutter"</item> - <item msgid="294890536998091748">"Ti minutter"</item> + <item msgid="465923292941002466">"1 minutt"</item> + <item msgid="7955177189296850016">"2 minutter"</item> + <item msgid="1244255986255344525">"5 minutter"</item> + <item msgid="294890536998091748">"10 minutter"</item> </string-array> </resources> |