From 972797db761f390f9f20bda5987d9441065d123a Mon Sep 17 00:00:00 2001
From: "Chris \"Koying\" Browet" <cbro@semperpax.com>
Date: Tue, 27 Dec 2016 12:09:46 +0100
Subject: [PATCH] FUCKIT: Just disable audio devices enumeration

---
 .../packaging/xbmc/src/org/xbmc/kodi/Main.java.in   |  9 +++++----
 xbmc/android/activity/XBMCApp.cpp                   | 13 +++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/tools/android/packaging/xbmc/src/org/xbmc/kodi/Main.java.in b/tools/android/packaging/xbmc/src/org/xbmc/kodi/Main.java.in
index 077b17dd9e..8fbe83f7ed 100644
--- a/tools/android/packaging/xbmc/src/org/xbmc/kodi/Main.java.in
+++ b/tools/android/packaging/xbmc/src/org/xbmc/kodi/Main.java.in
@@ -314,10 +314,11 @@ public class Main extends NativeActivity implements Choreographer.FrameCallback
     mSettingsContentObserver = new XBMCSettingsContentObserver(this, handler);
     getApplicationContext().getContentResolver().registerContentObserver(android.provider.Settings.System.CONTENT_URI, true, mSettingsContentObserver );
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-      AudioManager audioManager = (AudioManager)getSystemService(AUDIO_SERVICE);
-      audioManager.registerAudioDeviceCallback(new MyAudioDeviceCallback(), handler);
-    }
+    // Crashes on SATV as of FW 3.3
+    // if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+    //   AudioManager audioManager = (AudioManager)getSystemService(AUDIO_SERVICE);
+    //   audioManager.registerAudioDeviceCallback(new MyAudioDeviceCallback(), handler);
+    // }
     mJsonRPC = new XBMCJsonRPC();
 
     // Delayed Intent
diff --git a/xbmc/android/activity/XBMCApp.cpp b/xbmc/android/activity/XBMCApp.cpp
index b22d70fb5c..9c91de9fe7 100644
--- a/xbmc/android/activity/XBMCApp.cpp
+++ b/xbmc/android/activity/XBMCApp.cpp
@@ -245,12 +245,13 @@ void CXBMCApp::onResume()
     g_application.WakeUpScreenSaverAndDPMS();
 
   m_audiodevices.clear();
-  if (CJNIAudioManager::GetSDKVersion() >= 23)
-  {
-    CJNIAudioManager audioManager(getSystemService("audio"));
-    m_audiodevices = audioManager.getDevices(CJNIAudioManager::GET_DEVICES_OUTPUTS);
-    LogAudoDevices("OnResume", m_audiodevices);
-  }
+// Crashes on SATV as of FW 3.3
+//  if (CJNIAudioManager::GetSDKVersion() >= 23)
+//  {
+//    CJNIAudioManager audioManager(getSystemService("audio"));
+//    m_audiodevices = audioManager.getDevices(CJNIAudioManager::GET_DEVICES_OUTPUTS);
+//    LogAudoDevices("OnResume", m_audiodevices);
+//  }
   CheckHeadsetPlugged();
 
   unregisterMediaButtonEventReceiver();