From b4f01b966bd2ebf89623f9c65462b8b8b7034461 Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Tue, 24 Mar 2015 12:40:15 -0400 Subject: Remove the ability to disable audio service. Running in a configuration without audio service is not fully tested. Remove the configuration option for now. Also remove unused delegation layer in SoundPool. Bug: 19891112 Change-Id: I47be0e32d54b8ef8fa25cf47b85eacf8a4969500 --- core/java/android/view/ViewRootImpl.java | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'core/java/android/view/ViewRootImpl.java') diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 234de40..294174a 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -118,7 +118,6 @@ public final class ViewRootImpl implements ViewParent, * at 60 Hz. This can be used to measure the potential framerate. */ private static final String PROPERTY_PROFILE_RENDERING = "viewroot.profile_rendering"; - private static final String PROPERTY_MEDIA_DISABLED = "config.disable_media"; // properties used by emulator to determine display shape public static final String PROPERTY_EMULATOR_CIRCULAR = "ro.emulator.circular"; @@ -301,8 +300,6 @@ public final class ViewRootImpl implements ViewParent, private Choreographer.FrameCallback mRenderProfiler; private boolean mRenderProfilingEnabled; - private boolean mMediaDisabled; - // Variables to track frames per second, enabled via DEBUG_FPS flag private long mFpsStartTime = -1; private long mFpsPrevTime = -1; @@ -5360,10 +5357,6 @@ public final class ViewRootImpl implements ViewParent, public void playSoundEffect(int effectId) { checkThread(); - if (mMediaDisabled) { - return; - } - try { final AudioManager audioManager = getAudioManager(); @@ -5570,9 +5563,6 @@ public final class ViewRootImpl implements ViewParent, mProfileRendering = SystemProperties.getBoolean(PROPERTY_PROFILE_RENDERING, false); profileRendering(mAttachInfo.mHasWindowFocus); - // Media (used by sound effects) - mMediaDisabled = SystemProperties.getBoolean(PROPERTY_MEDIA_DISABLED, false); - // Hardware rendering if (mAttachInfo.mHardwareRenderer != null) { if (mAttachInfo.mHardwareRenderer.loadSystemProperties()) { -- cgit v1.1