Merge "Remove spammy transcode log"
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 3af81a2..74ff71e 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -35,6 +35,9 @@
},
{
"name": "fuse_node_test"
+ },
+ {
+ "name": "MediaProviderTranscodeTests"
}
],
"postsubmit": [
diff --git a/src/com/android/providers/media/TranscodeHelper.java b/src/com/android/providers/media/TranscodeHelper.java
index 507d89c..18122e5 100644
--- a/src/com/android/providers/media/TranscodeHelper.java
+++ b/src/com/android/providers/media/TranscodeHelper.java
@@ -672,7 +672,7 @@
private boolean isTranscodeEnabled() {
return getBooleanProperty(TRANSCODE_ENABLED_SYS_PROP_KEY,
- TRANSCODE_ENABLED_DEVICE_CONFIG_KEY, false /* defaultValue */);
+ TRANSCODE_ENABLED_DEVICE_CONFIG_KEY, true /* defaultValue */);
}
private void updateConfigs(boolean transcodeEnabled) {
diff --git a/tests/transcode/src/com/android/providers/media/transcode/TranscodeTest.java b/tests/transcode/src/com/android/providers/media/transcode/TranscodeTest.java
index 7315075..003f957 100644
--- a/tests/transcode/src/com/android/providers/media/transcode/TranscodeTest.java
+++ b/tests/transcode/src/com/android/providers/media/transcode/TranscodeTest.java
@@ -35,6 +35,7 @@
import android.media.ApplicationMediaCapabilities;
import android.media.MediaFormat;
import android.net.Uri;
+import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.os.ParcelFileDescriptor;
@@ -49,6 +50,7 @@
import java.util.List;
import org.junit.After;
+import org.junit.Assume;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -84,6 +86,9 @@
@Before
public void setUp() throws Exception {
+ // TODO(b/171789917): Cuttlefish doesn't support transcoding yet
+ Assume.assumeFalse(Build.MODEL.contains("Cuttlefish"));
+
TranscodeTestUtils.pollForExternalStorageState();
TranscodeTestUtils.grantPermission(getContext().getPackageName(),
Manifest.permission.READ_EXTERNAL_STORAGE);