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

Commit f82f0bc2 authored by Rob Carr's avatar Rob Carr Committed by Android (Google) Code Review
Browse files

Merge "SurfaceView: Fix null check on RemoteAccessibilityController"

parents d6eb7b3b 0d587ee6

core/java/android/view/SurfaceView.java

+1 −1
Original line number Diff line number Diff line
@@ -1849,7 +1849,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall 
        // If developers explicitly set the important mode for it, don't change the mode.

        // Only change the mode to important when this SurfaceView isn't explicitly set and has

        // an embedded hierarchy.

        if (!mRemoteAccessibilityController.connected()

        if ((mRemoteAccessibilityController!= null && !mRemoteAccessibilityController.connected())

                || mode != IMPORTANT_FOR_ACCESSIBILITY_AUTO) {

            return mode;

        }