am a5038d16: am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking...

* commit 'a5038d169f47b2e2278c0056495dfd4808803f8a':
  Fix ANRs due to Widevine DRM plugin sniff taking too long.

diff --cc media/libstagefright/AwesomePlayer.cpp
Simple merge

diff --cc media/libstagefright/DataSource.cpp
index e471f73,6134344..d0a7880
--- 1/media/libstagefright/DataSource.cpp
--- 2/media/libstagefright/DataSource.cpp
+++ b/media/libstagefright/DataSource.cpp
@@@ -118,8 -113,8 +119,9 @@@ void DataSource::RegisterDefaultSniffer
      RegisterSniffer(SniffMPEG2TS);
      RegisterSniffer(SniffMP3);
      RegisterSniffer(SniffAAC);
 +    RegisterSniffer(SniffAVI);
      RegisterSniffer(SniffMPEG2PS);
+     RegisterSniffer(SniffWVM);
  
      char value[PROPERTY_VALUE_MAX];
      if (property_get("drm.service.enabled", value, NULL)