Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 310fe5af: Merge "Use config.xml parameters instead of System properties." into mnc-dev

Browse Source 
* commit '310fe5af672891870dc072965ce8ce2178172003':
  Use config.xml parameters instead of System properties.
This commit is contained in:
Arunesh Mishra
2015-06-03 18:12:34 +00:00
committed by Android Git Automerger
parent 926c95272a 310fe5af67
commit 095b9b5b3a
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/res/res/values/config.xml
View File

@@ -2178,4 +2178,13 @@
Defaults to the older, deprecated config_windowIsRound already used in
some existing device-specific resource overlays. -->
<bool name="config_mainBuiltInDisplayIsRound">@bool/config_windowIsRound</bool>
<!-- Ultrasound support for Mic/speaker path -->
<!-- Whether the default microphone audio source supports near-ultrasound frequencies
(range of 18 - 21 kHz). -->
<bool name="config_supportMicNearUltrasound">true</bool>
<!-- Whether the default speaker audio output path supports near-ultrasound frequencies
(range of 18 - 21 kHz). -->
<bool name="config_supportSpeakerNearUltrasound">true</bool>
</resources>

2
core/res/res/values/symbols.xml
View File

@@ -301,6 +301,8 @@
<java-symbol type="bool" name="config_wifi_only_link_same_credential_configurations" />
<java-symbol type="bool" name="config_wifi_enable_disconnection_debounce" />
<java-symbol type="bool" name="config_wifi_enable_5GHz_preference" />
<java-symbol type="bool" name="config_supportMicNearUltrasound" />
<java-symbol type="bool" name="config_supportSpeakerNearUltrasound" />
<java-symbol type="integer" name="config_wifi_framework_5GHz_preference_boost_threshold" />
<java-symbol type="integer" name="config_wifi_framework_5GHz_preference_boost_factor" />
<java-symbol type="integer" name="config_wifi_framework_5GHz_preference_penalty_threshold" />

21
media/java/android/media/AudioManager.java
View File

@@ -38,7 +38,6 @@ import android.os.Looper;
import android.os.Message;
import android.os.Process;
import android.os.RemoteException;
import android.os.SystemProperties;
import android.os.SystemClock;
import android.os.ServiceManager;
import android.provider.Settings;
@@ -68,16 +67,6 @@ public class AudioManager {
private static String TAG = "AudioManager";
private static final AudioPortEventHandler sAudioPortEventHandler = new AudioPortEventHandler();
/**
* System properties for whether the default microphone and speaker paths support
* near-ultrasound frequencies (range of 18 - 21 kHz).
*/
private static final String SYSTEM_PROPERTY_MIC_NEAR_ULTRASOUND =
"persist.audio.mic.ultrasound";
private static final String SYSTEM_PROPERTY_SPEAKER_NEAR_ULTRASOUND =
"persist.audio.spkr.ultrasound";
private static final String DEFAULT_RESULT_FALSE_STRING = "false";
/**
* Broadcast intent, a hint for applications that audio is about to become
* 'noisy' due to a change in audio outputs. For example, this intent may
@@ -3213,11 +3202,13 @@ public class AudioManager {
int outputFramesPerBuffer = AudioSystem.getPrimaryOutputFrameCount();
return outputFramesPerBuffer > 0 ? Integer.toString(outputFramesPerBuffer) : null;
} else if (PROPERTY_SUPPORT_MIC_NEAR_ULTRASOUND.equals(key)) {
return SystemProperties.get(SYSTEM_PROPERTY_MIC_NEAR_ULTRASOUND,
DEFAULT_RESULT_FALSE_STRING);
// Will throw a RuntimeException Resources.NotFoundException if this config value is
// not found.
return String.valueOf(getContext().getResources().getBoolean(
com.android.internal.R.bool.config_supportMicNearUltrasound));
} else if (PROPERTY_SUPPORT_SPEAKER_NEAR_ULTRASOUND.equals(key)) {
return SystemProperties.get(SYSTEM_PROPERTY_SPEAKER_NEAR_ULTRASOUND,
DEFAULT_RESULT_FALSE_STRING);
return String.valueOf(getContext().getResources().getBoolean(
com.android.internal.R.bool.config_supportSpeakerNearUltrasound));
} else {
// null or unknown key
return null;