summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-09-02 09:39:23 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2018-09-02 09:39:23 -0700
commite3e73ab80b01e0c4ea11412e032626a363da97d9 (patch)
treef693f05c174daed16fa654aefcaf24688fa73f41 /src/com/android/gallery3d/app
parentd1700fc02166b43aadce4de0047116524b7a73a8 (diff)
parent61c4c4e8d339173d11df1ab44c6826d274ac3d2f (diff)
downloadandroid_packages_apps_Gallery2-e3e73ab80b01e0c4ea11412e032626a363da97d9.tar.gz
android_packages_apps_Gallery2-e3e73ab80b01e0c4ea11412e032626a363da97d9.tar.bz2
android_packages_apps_Gallery2-e3e73ab80b01e0c4ea11412e032626a363da97d9.zip
Merge "Add a property to control audio effect"
Diffstat (limited to 'src/com/android/gallery3d/app')
-rw-r--r--src/com/android/gallery3d/app/MovieActivity.java17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/com/android/gallery3d/app/MovieActivity.java b/src/com/android/gallery3d/app/MovieActivity.java
index 9b274c2db..f5e7a65fb 100644
--- a/src/com/android/gallery3d/app/MovieActivity.java
+++ b/src/com/android/gallery3d/app/MovieActivity.java
@@ -49,6 +49,7 @@ import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
+import android.os.SystemProperties;
import android.provider.MediaStore;
import android.provider.OpenableColumns;
import android.view.Gravity;
@@ -241,13 +242,15 @@ public class MovieActivity extends AbstractPermissionActivity {
// But for the performance (and battery), we remove the background here.
win.setBackgroundDrawable(null);
initMovieHooker(intent, savedInstanceState);
- // Determine available/supported effects
- final Descriptor[] effects = AudioEffect.queryEffects();
- for (final Descriptor effect : effects) {
- if (effect.type.equals(AudioEffect.EFFECT_TYPE_VIRTUALIZER)) {
- mVirtualizerSupported = true;
- } else if (effect.type.equals(AudioEffect.EFFECT_TYPE_BASS_BOOST)) {
- mBassBoostSupported = true;
+ if (!SystemProperties.getBoolean("persist.sys.galley.disable_audioeffects", false)) {
+ // Determine available/supported effects
+ final Descriptor[] effects = AudioEffect.queryEffects();
+ for (final Descriptor effect : effects) {
+ if (effect.type.equals(AudioEffect.EFFECT_TYPE_VIRTUALIZER)) {
+ mVirtualizerSupported = true;
+ } else if (effect.type.equals(AudioEffect.EFFECT_TYPE_BASS_BOOST)) {
+ mBassBoostSupported = true;
+ }
}
}