commit deb0335714cabc906098fb1d971d992027267fc6
author Andy Hung <hunga@google.com> Mon Aug 29 14:40:14 2016 -0700
committer Andy Hung <hunga@google.com> Tue Aug 30 02:24:58 2016 +0000
tree 91cb7cecab0980afbd73e44f78ee13c319a0f7fa
parent d60bac90266f3862ed60852b6de5b00cab389fb7

AudioFlinger: Disable (revert) LockWatch

    Revert "audioflinger: add watchdog on main mutex"
    This reverts commit 17a58b2560c38a8e31a38186f9ab6eb98a38e229.

    Revert "LockWatch: Update to Mutex::timeLock specs"
    This reverts commit 51a6319111df875710dab25a1a99b10d002c4869.

Bug: 30936184
Change-Id: I0f6df6c98c06e161038b1bf0aae5912619cb4066

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index c32eadd..79f4a66 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -246,9 +246,7 @@
     }
 
     mPatchPanel = new PatchPanel(this);
-    // FIXME: bug 30737845: trigger audioserver restart if main audioflinger lock
-    // is held continuously for more than 3 seconds
-    mLockWatch = new LockWatch(mLock, String8("AudioFlinger"));
+
     mMode = AUDIO_MODE_NORMAL;
 }
 
@@ -281,7 +279,6 @@
             }
         }
     }
-    mLockWatch->requestExitAndWait();
 }
 
 static const char * const audio_interfaces[] = {