| Index: media/base/media.cc
|
| diff --git a/media/base/media.cc b/media/base/media.cc
|
| index b2e1c4520174e7a04fb50c393dd3c32646700d2d..f80fcec87ba30ac72d68f786e6db30f64bd9dc6d 100644
|
| --- a/media/base/media.cc
|
| +++ b/media/base/media.cc
|
| @@ -103,8 +103,14 @@ bool IsUnifiedMediaPipelineEnabled() {
|
| const bool enabled_via_cli =
|
| base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kEnableUnifiedMediaPipeline);
|
| - return enabled_via_cli ||
|
| - base::StartsWith(group_name, "Enabled", base::CompareCase::SENSITIVE);
|
| + // TODO(watk, dalecurtis): AVDA has bugs on API level 16 and 17 so it's
|
| + // disabled for now. http://crbug.com/597467
|
| + const bool api_level_supported =
|
| + base::android::BuildInfo::GetInstance()->sdk_int() >= 18;
|
| +
|
| + return enabled_via_cli || (api_level_supported &&
|
| + base::StartsWith(group_name, "Enabled",
|
| + base::CompareCase::SENSITIVE));
|
| }
|
|
|
| bool IsUnifiedMediaPipelineEnabledForMse() {
|
|
|