diff options
| author | Rob Carr <racarr@google.com> | 2020-10-19 17:40:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-10-19 17:40:55 +0000 |
| commit | f82f0bc28e01fea9ec10ab0ebdcf9f7c5f031d66 (patch) | |
| tree | 3be47770756ca3c289ec6d2f490f260577fd9fff /core/java | |
| parent | d6eb7b3b7f35c0ee7d7e47a8e118293e95970e9b (diff) | |
| parent | 0d587ee61a12c4ad9729875128fc66a12516521c (diff) | |
Merge "SurfaceView: Fix null check on RemoteAccessibilityController"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/SurfaceView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java index 7b6a4f877d02..432d9279c48d 100644 --- a/core/java/android/view/SurfaceView.java +++ b/core/java/android/view/SurfaceView.java @@ -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; } |