diff options
| author | Lucas Lin <lucaslin@google.com> | 2020-06-03 03:26:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 03:26:10 +0000 |
| commit | e3e707a344a1a72b36cd21900060f07d36eaca2f (patch) | |
| tree | eca1bfe0c737998ceea3c7a28da36a62bc896598 /src | |
| parent | 55971628bcb8c3ecf6d6037f5a6c614918956ddf (diff) | |
| parent | 10039a4753b2436984a40291c73e916ab21fe852 (diff) | |
Add a null check to prevent NullPointerException am: 10039a4753
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11702815
Change-Id: Ifb1a34a9edef90fdf3220c51dea1e044af5d9c9d
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/server/connectivity/NetworkMonitor.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/server/connectivity/NetworkMonitor.java b/src/com/android/server/connectivity/NetworkMonitor.java index 4e56842..d0f62b2 100755 --- a/src/com/android/server/connectivity/NetworkMonitor.java +++ b/src/com/android/server/connectivity/NetworkMonitor.java @@ -1731,6 +1731,7 @@ public class NetworkMonitor extends StateMachine { } try { final List<CellInfo> cells = mTelephonyManager.getAllCellInfo(); + if (cells == null) return null; final Map<String, Integer> countryCodeMap = new HashMap<>(); int maxCount = 0; for (final CellInfo cell : cells) { |