| commit | ee773103f837e64d3fbc2f1fc804975a08328b03 | [log] [tgz] |
|---|---|---|
| author | Weng Su <wengsu@google.com> | Sat Dec 10 08:44:09 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Dec 10 08:44:09 2022 +0000 |
| tree | 6d653c4ebcea1b49958e289821735ba93c801a06 | |
| parent | b54c768b901d4050c09fdab0b7b4fe9b414bdcad [diff] | |
| parent | 956f288d1d7fd549c3b83fe33515c3f724b01aed [diff] |
Merge "fix WifiUtils:isNetworkLockedDown() null pointer issue" am: 956f288d1d Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2334743 Change-Id: I6b1d18248dc3026bda0e02e1d43fc350f1e9a680 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/settings/wifi/WifiUtils.java b/src/com/android/settings/wifi/WifiUtils.java index 4b94c81..4a3616a 100644 --- a/src/com/android/settings/wifi/WifiUtils.java +++ b/src/com/android/settings/wifi/WifiUtils.java
@@ -86,7 +86,7 @@ * @return true if Settings cannot modify the config due to lockDown. */ public static boolean isNetworkLockedDown(Context context, WifiConfiguration config) { - if (config == null) { + if (context == null || config == null) { return false; }