Skip to content

Commit

Permalink
Update from sb ota 1.3
Browse files Browse the repository at this point in the history
Change-Id: Ie0eb6d2624f2ec7cdf5aee365dcbde1968c5b866
  • Loading branch information
webgeek1234 authored and wrapped committed Jul 8, 2016
1 parent d563f11 commit abad793
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 10 deletions.
11 changes: 9 additions & 2 deletions audio/audio_policy.conf
Expand Up @@ -118,7 +118,14 @@ audio_hw_modules {
devices AUDIO_DEVICE_OUT_AUX_DIGITAL
flags AUDIO_OUTPUT_FLAG_DIRECT
}
}
hra_aux {
sampling_rates 96000|192000
channel_masks AUDIO_CHANNEL_OUT_STEREO
formats AUDIO_FORMAT_PCM_24_BIT_PACKED
devices AUDIO_DEVICE_OUT_AUX_DIGITAL
flags AUDIO_OUTPUT_FLAG_DIRECT
}
}
inputs {
primary {
sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000
Expand Down Expand Up @@ -168,7 +175,7 @@ audio_hw_modules {
inputs {
usb_device {
sampling_rates dynamic
channel_masks AUDIO_CHANNEL_IN_STEREO
channel_masks dynamic
formats dynamic
devices AUDIO_DEVICE_IN_USB_DEVICE
}
Expand Down
20 changes: 18 additions & 2 deletions audio/nvaudio_conf.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2015 NVIDIA Corporation. All Rights Reserved.
<!-- Copyright (c) 2015-2016 NVIDIA Corporation. All Rights Reserved.
NVIDIA Corporation and its licensors retain all intellectual property and
proprietary rights in and to this software and related documentation. Any
Expand All @@ -18,7 +18,7 @@
bps="16"
period_size="512"
period_count="4"
start_threshold="2047"
start_threshold="127"
stop_threshold="-1"
silence_threshold="0"
silence_size="-1"
Expand All @@ -36,6 +36,18 @@
silence_threshold="0"
avail_min="1"/>

<pcm_config name="fast-capture"
device_id="0"
rate="48000"
channels="2"
bps="16"
period_size="128"
period_count="4"
start_threshold="1"
stop_threshold="512"
silence_threshold="0"
avail_min="1"/>

<pcm_config name="bt-sco-playback"
device_id="2"
rate="8000"
Expand Down Expand Up @@ -121,11 +133,15 @@
avail_min="1"
devices="builtin-mic|headset-mic"/>

<param name="capture-init-silence-dmic" val="60"/>
<param name="capture-init-silence-hsmic" val="100"/>
<param name="nvoice" val="1"/>
<!--Speaker protection flag:
None -> Disable speaker protection
CPU -> CPU based speaker protection-->
<param name="spkprot-flag" val="CPU"/>
<param name="low latency devices" val="headphone|headset|speaker"/>
<param name="low latency period_size" val="128"/>

<!-- reset controls -->
<ctl name="Int Spk Switch" val="0"/>
Expand Down
12 changes: 6 additions & 6 deletions init/init_tn8.cpp
Expand Up @@ -127,8 +127,8 @@ void vendor_load_properties()
switch (detected_model) {
case wx_na_wf:
/* Wi-Fi Only */
property_set("ro.build.fingerprint", "nvidia/wx_na_wf/shieldtablet:6.0.1/MRA58K/40827_700.6895:user/release-keys");
property_set("ro.build.description", "wx_na_wf-user 6.0.1 MRA58K 40827_700.6895 release-keys");
property_set("ro.build.fingerprint", "nvidia/wx_na_wf/shieldtablet:6.0.1/MRA58K/40827_726.6502:user/release-keys");
property_set("ro.build.description", "wx_na_wf-user 6.0.1 MRA58K 40827_726.6502 release-keys");
property_set("ro.product.model", "wx_na_wf");
property_set("ro.radio.noril", "true");
break;
Expand All @@ -137,17 +137,17 @@ void vendor_load_properties()
/* Data Only, Can't tell the difference from cmdline, so just using wx_un_do. It's the same hardware for both versions */
gsm_properties();
property_set("ro.modem.do", "1");
property_set("ro.build.fingerprint", "nvidia/wx_un_do/shieldtablet:6.0.1/MRA58K/40827_700.6895:user/release-keys");
property_set("ro.build.description", "wx_un_do-user 6.0.1 MRA58K 40827_700.6895 release-keys");
property_set("ro.build.fingerprint", "nvidia/wx_un_do/shieldtablet:6.0.1/MRA58K/40827_726.6502:user/release-keys");
property_set("ro.build.description", "wx_un_do-user 6.0.1 MRA58K 40827_726.6502 release-keys");
property_set("ro.product.model", "wx_un_do");
break;

case wx_un_mo:
/* Rest of World Voice (Device never got released, but is partially in upstream source) */
gsm_properties();
property_set("ro.modem.vc", "1");
property_set("ro.build.fingerprint", "nvidia/wx_un_mo/shieldtablet:6.0.1/MRA58K/40827_700.6895:user/release-keys");
property_set("ro.build.description", "wx_un_mo-user 6.0.1 MRA58K 40827_700.6895 release-keys");
property_set("ro.build.fingerprint", "nvidia/wx_un_mo/shieldtablet:6.0.1/MRA58K/40827_726.6502:user/release-keys");
property_set("ro.build.description", "wx_un_mo-user 6.0.1 MRA58K 40827_726.6502 release-keys");
property_set("ro.product.model", "wx_un_mo");
break;
}
Expand Down

0 comments on commit abad793

Please sign in to comment.