Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b231f85a authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "AudioService: fix initial spatial audio enable state." into tm-qpr-dev... 

Merge "AudioService: fix initial spatial audio enable state." into tm-qpr-dev am: 5b0218ab am: f689360b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19497892



Change-Id: Iad32fe20c2989d5e2c727cd2d5d30419a62af2ab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cb34655a f689360b

services/core/java/com/android/server/audio/SpatializerHelper.java

+9 −13
Original line number Diff line number Diff line
@@ -751,33 +751,29 @@ public class SpatializerHelper { 
                if (enabled) {

                    throw (new IllegalStateException("Can't enable when uninitialized"));

                }

                return;

                break;

            case STATE_NOT_SUPPORTED:

                if (enabled) {

                    Log.e(TAG, "Can't enable when unsupported");

                }

                return;

                break;

            case STATE_DISABLED_UNAVAILABLE:

            case STATE_DISABLED_AVAILABLE:

                if (enabled) {

                    createSpat();

                    onRoutingUpdated();

                    // onRoutingUpdated() can update the "enabled" state based on context

                    // and will call setDispatchFeatureEnabledState().

                } // else { nothing to do as already disabled }

                break;

                } else {

                    // already in disabled state

                    return;

                }

            case STATE_ENABLED_UNAVAILABLE:

            case STATE_ENABLED_AVAILABLE:

                if (!enabled) {

                    releaseSpat();

                    setDispatchFeatureEnabledState(false, "setSpatializerEnabledInt");

                } // else { nothing to do as already enabled }

                break;

                } else {

                    // already in enabled state

                    return;

                }

        }

        setDispatchFeatureEnabledState(enabled, "setSpatializerEnabledInt");

    }



    synchronized int getCapableImmersiveAudioLevel() {