diff options
| author | 2024-04-18 17:26:58 +0000 | |
|---|---|---|
| committer | 2024-04-18 17:43:06 +0000 | |
| commit | 4686d3eff8ec09d453b2e94565fa2ee6948d82fe (patch) | |
| tree | 9cc805b83a020c64e3f64f03fd5f31416d54f5a1 | |
| parent | d1488ececf71df179d4574385a82ce6067218ce6 (diff) | |
Fix NPE with UsbManager
Not all devices have USB.
Test: no NPE starting the settings app.
Change-Id: I6e0bf5084e4fa225522c4d0d3187730a47058507
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/Utils.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/Utils.java b/packages/SettingsLib/src/com/android/settingslib/Utils.java index 563f02d95f3c..c2506d353d14 100644 --- a/packages/SettingsLib/src/com/android/settingslib/Utils.java +++ b/packages/SettingsLib/src/com/android/settingslib/Utils.java @@ -765,7 +765,11 @@ public class Utils { return false; } - final List<UsbPort> usbPortList = context.getSystemService(UsbManager.class).getPorts(); + final UsbManager usbManager = context.getSystemService(UsbManager.class); + if (usbManager == null) { + return false; + } + final List<UsbPort> usbPortList = usbManager.getPorts(); if (usbPortList == null || usbPortList.isEmpty()) { return false; } |