summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Daniel Norman <danielnorman@google.com> 2025-02-06 12:50:48 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2025-02-06 12:50:48 -0800
commit3c751e94e85a54d7957829b1b53080e80fb9e55e (patch)
tree889d2444e5ad45803ac9d4508be347d9c3757954
parent33593e89241c6fe0ceca157199a5bf7459b521df (diff)
parent7047502bd791b4f2b0e1538527653ab98ceeea75 (diff)
Merge "Add null check for magnificationSettingsController" into main
-rw-r--r--packages/SystemUI/src/com/android/systemui/accessibility/MagnificationImpl.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationImpl.java b/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationImpl.java
index 5482c3d3ea18..115242eb13aa 100644
--- a/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationImpl.java
@@ -453,7 +453,9 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks
final MagnificationSettingsController magnificationSettingsController =
mMagnificationSettingsSupplier.get(displayId);
- magnificationSettingsController.setMagnificationScale(scale);
+ if (magnificationSettingsController != null) {
+ magnificationSettingsController.setMagnificationScale(scale);
+ }
}
@VisibleForTesting