Made adjustments for Android 11.
