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

This commit is contained in:
Jean-Michel Trivi
2023-03-17 16:17:48 +00:00
committed by Android (Google) Code Review

View File

@@ -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;
}