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

Commit f89f38d7 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Automerger Merge Worker
Browse files

Merge "ViewRootImpl: lazy initialization of mFastScrollSoundEffectsEnabled"... 

Merge "ViewRootImpl: lazy initialization of mFastScrollSoundEffectsEnabled" into udc-dev am: f9307cb5

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



Change-Id: Ie3be66127949cc25f9cf2acdc0a639549c79d270
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 075bd752 f9307cb5

core/java/android/view/ViewRootImpl.java

+3 −3
Original line number Diff line number Diff line
@@ -417,7 +417,8 @@ public final class ViewRootImpl implements ViewParent, 
    private boolean mUseBLASTAdapter;

    private boolean mForceDisableBLAST;



    private boolean mFastScrollSoundEffectsEnabled;

    /** lazily-initialized in getAudioManager() */

    private boolean mFastScrollSoundEffectsEnabled = false;



    /**

     * Signals that compatibility booleans have been initialized according to
@@ -1028,8 +1029,6 @@ public final class ViewRootImpl implements ViewParent, 


        loadSystemProperties();

        mImeFocusController = new ImeFocusController(this);

        AudioManager audioManager = mContext.getSystemService(AudioManager.class);

        mFastScrollSoundEffectsEnabled = audioManager.areNavigationRepeatSoundEffectsEnabled();



        mScrollCaptureRequestTimeout = SCROLL_CAPTURE_REQUEST_TIMEOUT_MILLIS;

        mOnBackInvokedDispatcher = new WindowOnBackInvokedDispatcher(context);
@@ -8340,6 +8339,7 @@ public final class ViewRootImpl implements ViewParent, 
        }

        if (mAudioManager == null) {

            mAudioManager = (AudioManager) mView.getContext().getSystemService(Context.AUDIO_SERVICE);

            mFastScrollSoundEffectsEnabled = mAudioManager.areNavigationRepeatSoundEffectsEnabled();

        }

        return mAudioManager;

    }