commit cbbda3ed6a94b115601cdabf0f8e2c2fed918657
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 10 04:37:50 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 10 04:37:50 2022 +0000
tree a997c79daf46f5c64085c0c343daf083ed37e179
parent c093f14c182c214f2e7e25103b1320502634fb1d
parent aa2291a6fb557182cdecc5086010b523d77634c2

Merge "ethernet: IpConfigStore#readIpConfigurations() can return null"

service-t/src/com/android/server/ethernet/EthernetConfigStore.java

diff --git a/service-t/src/com/android/server/ethernet/EthernetConfigStore.java b/service-t/src/com/android/server/ethernet/EthernetConfigStore.java
index 6006539..e4445d0 100644
--- a/service-t/src/com/android/server/ethernet/EthernetConfigStore.java
+++ b/service-t/src/com/android/server/ethernet/EthernetConfigStore.java
@@ -107,8 +107,13 @@
     }
 
     private void loadConfigFileLocked(final String filepath) {
+        // readIpConfigurations can return null when the version is invalid.
         final ArrayMap<String, IpConfiguration> configs =
                 IpConfigStore.readIpConfigurations(filepath);
+        if (configs == null) {
+            Log.e(TAG, "IpConfigStore#readIpConfigurations() returned null");
+            return;
+        }
         mIpConfigurations.putAll(configs);
     }