Fix sound on Nexus 7.

A behavior change in the HW audio driver for 4.2.2 causes the audio
routing to never be set up automatically.
Set the audio orientation to force the HW driver to set up audio
routing.

Task-number: QTRD-2472
Change-Id: I6f76aa299d0bc89c7061c7074dc5780e62045f0a
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>

1 files changed, 3 insertions, 20 deletions

diff --git a/src/qt_hw_init/main.cpp b/src/qt_hw_init/main.cpp
index 9fb810a..3419c21 100644
--- a/src/qt_hw_init/main.cpp
+++ b/src/qt_hw_init/main.cpp
@@ -3,6 +3,9 @@
 
 static void setMaxVolume(QDroidUtils *utils)
 {
+    // Set the audio orientation to something to force the HW driver to reconfigure
+    // audio routing (workaround for bug on Nexus 7)
+    utils->setOrientationForAudioSystem(QDroidUtils::LandscapeAudioOrientation);
     utils->setMasterVolume(100);
     utils->setMasterMute(false);
     utils->setStreamVolume(QDroidUtils::SystemAudioStream, 100);
@@ -16,32 +19,12 @@ static void setDisplayBrightness(QDroidUtils *utils)
     utils->setDisplayBrightness(255);
 }
 
-static void showValues(QDroidUtils *utils)
-{
-    qDebug() << "Master volume:" << utils->masterVolume();
-    qDebug() << "Master mute:" << utils->masterMute();
-    qDebug() << "System audio volume:" << utils->streamVolume(QDroidUtils::SystemAudioStream);
-    qDebug() << "System audio mute:" << utils->streamMute(QDroidUtils::SystemAudioStream);
-    qDebug() << "Music audio volume:" << utils->streamVolume(QDroidUtils::MusicAudioStream);
-    qDebug() << "Music audio mute:" << utils->streamMute(QDroidUtils::MusicAudioStream);
-    qDebug() << "Notification audio volume:" << utils->streamVolume(QDroidUtils::NotificationAudioStream);
-    qDebug() << "Notification audio mute:" << utils->streamMute(QDroidUtils::NotificationAudioStream);
-    qDebug() << "EnforcedAudible audio volume:" << utils->streamVolume(QDroidUtils::EnforcedAudibleAudioStream);
-    qDebug() << "EnforcedAudible audio mute:" << utils->streamMute(QDroidUtils::EnforcedAudibleAudioStream);
-}
-
 int main(int, char *[])
 {
     QDroidUtils utils;
 
-    qDebug() << "Audio settings before change:";
-    showValues(&utils);
-
     setMaxVolume(&utils);
     setDisplayBrightness(&utils);
 
-    qDebug() << "Audio settings after change:";
-    showValues(&utils);
-
     return 0;
 }