am 3f6a7d1e: am d70c64db: Revert the following patches because they may lead to power...

* commit '3f6a7d1ee961a4544563932b7499535dc1cac1ec':
  Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix."    This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.

diff --cc drm/drmserver/DrmManager.cpp
Simple merge

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

diff --cc media/libstagefright/DataSource.cpp
index d0a7880,43539bb..e471f73
--- 1/media/libstagefright/DataSource.cpp
--- 2/media/libstagefright/DataSource.cpp
+++ b/media/libstagefright/DataSource.cpp
@@@ -119,9 -112,7 +118,8 @@@ 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)

diff --cc media/libstagefright/MediaExtractor.cpp
index d65dc51,374ecf7..2171492
--- 1/media/libstagefright/MediaExtractor.cpp
--- 2/media/libstagefright/MediaExtractor.cpp
+++ b/media/libstagefright/MediaExtractor.cpp
@@@ -110,15 -109,10 +110,12 @@@ sp<MediaExtractor> MediaExtractor::Crea
          ret = new MatroskaExtractor(source);
      } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_MPEG2TS)) {
          ret = new MPEG2TSExtractor(source);
 +    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_AVI)) {
 +        ret = new AVIExtractor(source);
      } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_WVM)) {
          ret = new WVMExtractor(source);
-         if (ret != NULL) {
-             isDrm = true;
-         }
      } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC_ADTS)) {
 -        ret = new AACExtractor(source);
 +        ret = new AACExtractor(source, meta);
      } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_MPEG2PS)) {
          ret = new MPEG2PSExtractor(source);
      }