From b87d22b865b1e706da352f1a9ddc35b4efdfe70b Mon Sep 17 00:00:00 2001 From: Irfan Sheriff Date: Tue, 6 Dec 2011 11:20:30 -0800 Subject: Disable wifiwatchdog for now Change-Id: I2ac4fa706f3d0a415cb8e86002173b776aba4e02 --- wifi/java/android/net/wifi/WifiWatchdogStateMachine.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java b/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java index b4cbd01693f3..9769718092c1 100644 --- a/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java +++ b/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java @@ -383,7 +383,9 @@ public class WifiWatchdogStateMachine extends StateMachine { } private boolean isWatchdogEnabled() { - return getSettingsBoolean(mContentResolver, Settings.Secure.WIFI_WATCHDOG_ON, true); + //return getSettingsBoolean(mContentResolver, Settings.Secure.WIFI_WATCHDOG_ON, true); + //TODO: fix this when we do aggressive monitoring + return false; } private void updateSettings() { -- cgit v1.2.3-59-g8ed1b From 81cab1752ea95c5772a2141602c8654360c18896 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Tue, 6 Dec 2011 10:59:48 -0800 Subject: DO NOT MERGE: Remove the AVI extractor. Change-Id: Ib9cb4a48bd817da703ef53eb14932616d2973ee0 --- media/libstagefright/Android.mk | 1 - media/libstagefright/DataSource.cpp | 2 -- media/libstagefright/MediaExtractor.cpp | 3 --- 3 files changed, 6 deletions(-) diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 0b1a2af46bc5..16db5bc1b648 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -9,7 +9,6 @@ LOCAL_SRC_FILES:= \ AACWriter.cpp \ AMRExtractor.cpp \ AMRWriter.cpp \ - AVIExtractor.cpp \ AudioPlayer.cpp \ AudioSource.cpp \ AwesomePlayer.cpp \ diff --git a/media/libstagefright/DataSource.cpp b/media/libstagefright/DataSource.cpp index c16b3b503219..7c2096ecb198 100644 --- a/media/libstagefright/DataSource.cpp +++ b/media/libstagefright/DataSource.cpp @@ -15,7 +15,6 @@ */ #include "include/AMRExtractor.h" -#include "include/AVIExtractor.h" #include "include/MP3Extractor.h" #include "include/MPEG4Extractor.h" #include "include/WAVExtractor.h" @@ -112,7 +111,6 @@ void DataSource::RegisterDefaultSniffers() { RegisterSniffer(SniffMPEG2TS); RegisterSniffer(SniffMP3); RegisterSniffer(SniffAAC); - RegisterSniffer(SniffAVI); char value[PROPERTY_VALUE_MAX]; if (property_get("drm.service.enabled", value, NULL) diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libstagefright/MediaExtractor.cpp index a8023df60789..8e0a18c9c199 100644 --- a/media/libstagefright/MediaExtractor.cpp +++ b/media/libstagefright/MediaExtractor.cpp @@ -19,7 +19,6 @@ #include #include "include/AMRExtractor.h" -#include "include/AVIExtractor.h" #include "include/MP3Extractor.h" #include "include/MPEG4Extractor.h" #include "include/WAVExtractor.h" @@ -109,8 +108,6 @@ sp MediaExtractor::Create( 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); } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC_ADTS)) { -- cgit v1.2.3-59-g8ed1b