summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-08-06 14:19:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-08-06 14:19:23 +0000
commit80f2cb5148fe0a21572082bffa4ea26c5835e3c4 (patch)
treea7fc6dcf4a76202d7e9167b1847d92b89ab49b2e
parentca1447d5ff9e3db75771813fe8137adbe1cc6330 (diff)
parent411915fc34dc6d96775b36d2d1cb06cb729ea270 (diff)
Merge "SupplicantStaIfaceHal: check for null SupplicantStatus" into rvc-qpr-dev
-rw-r--r--service/java/com/android/server/wifi/SupplicantStaIfaceHal.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java b/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java
index 667abfe35..b587eed38 100644
--- a/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java
+++ b/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java
@@ -2560,7 +2560,7 @@ public class SupplicantStaIfaceHal {
private boolean checkStatusAndLogFailure(SupplicantStatus status,
final String methodStr) {
synchronized (mLock) {
- if (status.code != SupplicantStatusCode.SUCCESS) {
+ if (status == null || status.code != SupplicantStatusCode.SUCCESS) {
Log.e(TAG, "ISupplicantStaIface." + methodStr + " failed: " + status);
return false;
} else {