Remove obsolete ENABLE_TREBLE references.
am: f4d9e90d7d
Change-Id: Iefa670434877c326a5cb7038f688a20c1a325b6d
diff --git a/ShamuLayout/res/values-kn-rIN/strings.xml b/ShamuLayout/res/values-kn-rIN/strings.xml
index 057af0b..cf64f38 100644
--- a/ShamuLayout/res/values-kn-rIN/strings.xml
+++ b/ShamuLayout/res/values-kn-rIN/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="4827444239162090155">"Nexus 6 ಮುಖಪುಟ ಪರದೆ"</string>
+ <string name="app_label" msgid="4827444239162090155">"Nexus 6 ಹೋಮ್ ಪರದೆ"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
<string name="create_folder_title" msgid="1626185277541881691">"ರಚಿಸಿ"</string>
<string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
diff --git a/device.mk b/device.mk
index 5f0ee44..6f1a9c1 100644
--- a/device.mk
+++ b/device.mk
@@ -417,3 +417,7 @@
# OEM Unlock reporting
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
ro.oem_unlock_supported=1
+
+# ro.product.first_api_level indicates the first api level the device has commercially launched on.
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.product.first_api_level=21
diff --git a/gps.conf b/gps.conf
index e2e0ed9..d0b0a3f 100644
--- a/gps.conf
+++ b/gps.conf
@@ -3,11 +3,12 @@
# below will be ignored, and instead the servers will
# be queried from the modem.
XTRA_SERVER_QUERY=0
+
# XTRA_SERVERs below are used only if XTRA_SERVER_QUERY
# is off.
-XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin
-XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin
-XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin
+XTRA_SERVER_1=https://xtrapath1.izatcloud.net/xtra2.bin
+XTRA_SERVER_2=https://xtrapath2.izatcloud.net/xtra2.bin
+XTRA_SERVER_3=https://xtrapath3.izatcloud.net/xtra2.bin
# Error Estimate
# _SET = 1
diff --git a/mixer_paths.xml b/mixer_paths.xml
index 7c5d02e..34944d0 100644
--- a/mixer_paths.xml
+++ b/mixer_paths.xml
@@ -156,36 +156,8 @@
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="0" />
<!-- usb headset end -->
<ctl name="BOOST ENABLE Spkr Left Prot" value="0" />
- <ctl name="BOOST_STUB Right Mixer right MM_DL1" value="0" />
- <ctl name="BOOST_STUB Right Mixer right MM_DL2" value="0" />
- <ctl name="BOOST_STUB Right Mixer right MM_DL3" value="0" />
- <ctl name="BOOST_STUB Right Mixer right MM_DL4" value="0" />
- <ctl name="BOOST_STUB Right Mixer right MM_DL5" value="0" />
- <ctl name="BOOST_STUB Right Mixer right MM_DL6" value="0" />
- <ctl name="BOOST_STUB Right Mixer right MM_DL7" value="0" />
- <ctl name="BOOST_STUB Right Mixer right MM_DL8" value="0" />
- <ctl name="BOOST_STUB Right Mixer right VOIP_DL" value="0" />
- <ctl name="BOOST_STUB Right Mixer right CS-VOICE_DL1" value="0" />
- <ctl name="BOOST_STUB Right Mixer right VOICE2_DL" value="0" />
- <ctl name="BOOST_STUB Right Mixer right VoLTE_DL" value="0" />
- <ctl name="BOOST_STUB Right Mixer right VOLTE_STUB_DL" value="0" />
- <ctl name="BOOST_STUB Right Mixer right VOICE_STUB_DL" value="0" />
- <ctl name="BOOST_STUB Right Mixer right VOICE2_STUB_DL" value="0" />
- <ctl name="BOOST_STUB Left Mixer left MM_DL1" value="0" />
- <ctl name="BOOST_STUB Left Mixer left MM_DL2" value="0" />
- <ctl name="BOOST_STUB Left Mixer left MM_DL3" value="0" />
- <ctl name="BOOST_STUB Left Mixer left MM_DL4" value="0" />
- <ctl name="BOOST_STUB Left Mixer left MM_DL5" value="0" />
- <ctl name="BOOST_STUB Left Mixer left MM_DL6" value="0" />
- <ctl name="BOOST_STUB Left Mixer left MM_DL7" value="0" />
- <ctl name="BOOST_STUB Left Mixer left MM_DL8" value="0" />
- <ctl name="BOOST_STUB Left Mixer left VOIP_DL" value="0" />
- <ctl name="BOOST_STUB Left Mixer left CS-VOICE_DL1" value="0" />
- <ctl name="BOOST_STUB Left Mixer left VOICE2_DL" value="0" />
- <ctl name="BOOST_STUB Left Mixer left VoLTE_DL" value="0" />
- <ctl name="BOOST_STUB Left Mixer left VOLTE_STUB_DL" value="0" />
- <ctl name="BOOST_STUB Left Mixer left VOICE_STUB_DL" value="0" />
- <ctl name="BOOST_STUB Left Mixer left VOICE2_STUB_DL" value="0" />
+ <ctl name="BOOST_STUB Right Mixer right" value="0" />
+ <ctl name="BOOST_STUB Left Mixer left" value="0" />
<ctl name="BOOST earpiece mode" value="Off" />
<ctl name="QUAT_MI2S_RX Channels" value="One" />
<ctl name="BOOST Left Ch Select" value="1" />
@@ -342,8 +314,6 @@
<path name="deep-buffer-playback speaker">
<ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia1" value="1" />
- <ctl name="BOOST_STUB Right Mixer right MM_DL1" value="1" />
- <ctl name="BOOST_STUB Left Mixer left MM_DL1" value="1" />
</path>
<path name="deep-buffer-playback handset">
@@ -391,8 +361,6 @@
<path name="low-latency-playback speaker">
<ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia5" value="1" />
- <ctl name="BOOST_STUB Right Mixer right MM_DL5" value="1" />
- <ctl name="BOOST_STUB Left Mixer left MM_DL5" value="1" />
</path>
<path name="low-latency-playback handset">
@@ -428,8 +396,6 @@
<path name="compress-offload-playback speaker">
<ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia4" value="1" />
- <ctl name="BOOST_STUB Right Mixer right MM_DL4" value="1" />
- <ctl name="BOOST_STUB Left Mixer left MM_DL4" value="1" />
</path>
<path name="compress-offload-playback handset">
@@ -510,8 +476,6 @@
<ctl name="QUAT_MI2S_RX_Voice Mixer Voice Stub" value="1" />
<ctl name="Voice Stub Tx Mixer STUB_TX_HL" value="1" />
<ctl name="Voice Stub Tx Mixer STUB_1_TX_HL" value="1" />
- <ctl name="BOOST_STUB Right Mixer right VOICE_STUB_DL" value="1" />
- <ctl name="BOOST_STUB Left Mixer left VOICE_STUB_DL" value="1" />
</path>
<path name="voice-call speaker">
@@ -610,8 +574,6 @@
<ctl name="QUAT_MI2S_RX_Voice Mixer VoLTE Stub" value="1" />
<ctl name="VoLTE Stub Tx Mixer STUB_TX_HL" value="1" />
<ctl name="VoLTE Stub Tx Mixer STUB_1_TX_HL" value="1" />
- <ctl name="BOOST_STUB Right Mixer right VOLTE_STUB_DL" value="1" />
- <ctl name="BOOST_STUB Left Mixer left VOLTE_STUB_DL" value="1" />
</path>
<path name="volte-call speaker">
@@ -774,7 +736,9 @@
<!-- Select Right channel on Right IC bypass mode -->
<ctl name="BOOST Right Ch Select" value="2" />
<!-- Enable Mixers to power up Left and Right IC's -->
- <path name="speaker-gain-default" />
+ <ctl name="BOOST_STUB Right Mixer right" value="1" />
+ <ctl name="BOOST_STUB Left Mixer left" value="1" />
+ <path name="speaker-gain-default" />
</path>
<path name="speaker-reverse">
@@ -785,6 +749,9 @@
<ctl name="BOOST Left Ch Select" value="2" />
<!-- Select Right channel on Right IC bypass mode -->
<ctl name="BOOST Right Ch Select" value="1" />
+ <!-- Enable Mixers to power up Left and Right IC's -->
+ <ctl name="BOOST_STUB Right Mixer right" value="1" />
+ <ctl name="BOOST_STUB Left Mixer left" value="1" />
</path>
<path name="speaker-safe">
@@ -792,7 +759,8 @@
<!-- Select mono channel on Right IC -->
<ctl name="BOOST Right Ch Select" value="3" />
<!-- Enable Mixers to power up Right IC only -->
- <path name="speaker-safe-gain-default" />
+ <ctl name="BOOST_STUB Right Mixer right" value="1" />
+ <path name="speaker-safe-gain-default" />
</path>
<path name="speaker-mic">
@@ -812,6 +780,9 @@
<path name="handset">
<!-- Enable earpiece mode this toggles gpio -->
<ctl name="BOOST earpiece mode" value="On" />
+ <!-- Enable Mixer to power up Left IC -->
+ <ctl name="BOOST_STUB Left Mixer left" value="1" />
+ <ctl name="BOOST_STUB Right Mixer right" value="0" />
<!-- select (l + r)/2 -->
<ctl name="BOOST Left Ch Select" value="3" />
<!-- bypass dsp -->
@@ -886,6 +857,9 @@
<path name="voice-speaker">
<!-- Disable earpiece mode -->
<ctl name="BOOST earpiece mode" value="Off" />
+ <!-- Enable Mixer to power up Left IC -->
+ <ctl name="BOOST_STUB Left Mixer left" value="1" />
+ <ctl name="BOOST_STUB Right Mixer right" value="0" />
<!-- select (l + r)/2 -->
<ctl name="BOOST Left Ch Select" value="3" />
</path>
@@ -915,23 +889,25 @@
<ctl name="BOOST earpiece mode" value="Off" />
<ctl name="BOOST Left Ch Select" value="3" />
<ctl name="BOOST Right Ch Select" value="3" />
- <path name="spkr-gain-in-headphone-combo" />
+ <ctl name="BOOST_STUB Right Mixer right" value="1" />
+ <ctl name="BOOST_STUB Left Mixer left" value="1" />
+ <path name="spkr-gain-in-headphone-combo" />
</path>
<path name="speaker-safe-and-headphones">
<path name="speaker-safe" />
<path name="headphones" />
- <path name="spkr-safe-gain-in-headphone-combo" />
+ <path name="spkr-safe-gain-in-headphone-combo" />
</path>
<path name="speaker-and-line">
<path name="speaker-and-headphones" />
- <path name="spkr-gain-in-line-combo" />
+ <path name="spkr-gain-in-line-combo" />
</path>
<path name="speaker-safe-and-line">
<path name="speaker-safe-and-headphones" />
- <path name="spkr-safe-gain-in-line-combo" />
+ <path name="spkr-safe-gain-in-line-combo" />
</path>
<path name="voice-rec-mic">
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 69822af..e4d46d0 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -272,6 +272,7 @@
<!-- Dream of notifications -->
<string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
<bool name="config_dozeAfterScreenOff">true</bool>
+ <bool name="config_dozePulsePickup">true</bool>
<bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
<!-- Is the device capable of hot swapping an UICC Card -->
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index d9918c7..c3fa2c1 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -34,7 +34,5 @@
<!-- Doze: does this device support STATE_DOZE and STATE_DOZE_SUSPEND? -->
<bool name="doze_display_state_supported">true</bool>
- <!-- Doze: should the pickup sensor be used as a pulse signal? -->
- <bool name="doze_pulse_on_pick_up">true</bool>
</resources>
