Merge stage-dr1-aosp-master into stage-aosp-master

Bug: 112535855
Change-Id: Iebbfe1ff37d838ce4a359368be6adce2f45c4077
This commit is contained in:
Xin Li
2018-08-13 13:01:02 -07:00

View File

@@ -179,9 +179,9 @@
<item>8</item>
</integer-array>
<!-- Boolean indicating whether framework needs to set the tx power limit for meeting SAR requirements
during voice calls -->
<bool translatable="false" name="config_wifi_framework_enable_voice_call_sar_tx_power_limit">true</bool>
<!-- Boolean indicating whether framework needs to set the tx power limit for meeting SAR
requirements -->
<bool translatable="false" name="config_wifi_framework_enable_sar_tx_power_limit">true</bool>
<!-- Whether the display blanks itself when transitioning from a doze to a non-doze state -->
<bool name="config_displayBlanksAfterDoze">true</bool>