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

Commit 5e98cd45 authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "AudioService: fix initial spatial audio enable state." am: 4dc6c54d... 

Merge "AudioService: fix initial spatial audio enable state." am: 4dc6c54d am: 0f442787 am: 72f5ab8a

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



Change-Id: Iffd18f35f5144ecbd8d547e322ed695f7f06c683
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5fc8a5a5 72f5ab8a

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

+9 −13
Original line number Diff line number Diff line
@@ -752,33 +752,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() {