FUCKIT: Just disable audio devices enumeration

koying · Dec 27, 2016 · 972797d · 972797d
1 parent 94c9c31
commit 972797d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 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
@@ -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
@@ -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();