summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorKai Shi <kaishi@google.com>2020-03-16 16:24:53 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-03-16 16:24:53 +0000
commit93526d003fb4f091541b61f79a6d449a9a6489e2 (patch)
treea2b646984a7c6011a6929f4835bc7311cf097a1e /service
parentb809d33d5c375556ba5903c4b052f2603e95aaad (diff)
parent38ac66aaa9d9f9526f700d693ab8c5207103a85b (diff)
Merge "Bug fix of WifiHealthMonitor when Wifi is not up" into rvc-dev
Diffstat (limited to 'service')
-rw-r--r--service/java/com/android/server/wifi/WifiHealthMonitor.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiHealthMonitor.java b/service/java/com/android/server/wifi/WifiHealthMonitor.java
index 4228e0d6a..b85fa5fbe 100644
--- a/service/java/com/android/server/wifi/WifiHealthMonitor.java
+++ b/service/java/com/android/server/wifi/WifiHealthMonitor.java
@@ -491,6 +491,9 @@ public class WifiHealthMonitor {
* Extract current software build information from the running software.
*/
private WifiSoftwareBuildInfo extractCurrentSoftwareBuildInfo() {
+ if (!mWifiEnabled) {
+ return null;
+ }
PackageManager packageManager = mContext.getPackageManager();
int wifiStackVersion = 0;
try {