diff options
| author | Mukesh Agrawal <quiche@google.com> | 2016-07-12 01:05:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-12 01:05:56 +0000 |
| commit | 62a41b4a43cba3fad221291533c145863b7001f0 (patch) | |
| tree | 9c48d6641239d93708e03c6bda9fb0014d934083 /service | |
| parent | 20d76f6f2f264cc27a8821e46ad1bd1dc50700e7 (diff) | |
| parent | 367a496587a34be0aec60765eeb1365baadf03bc (diff) | |
| download | wifi-62a41b4a43cba3fad221291533c145863b7001f0.tar.gz | |
Merge "WifiNative: make getLocalLog() an instance method" into nyc-mr1-dev
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiMonitor.java | 7 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/WifiNative.java | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/service/java/com/android/server/wifi/WifiMonitor.java b/service/java/com/android/server/wifi/WifiMonitor.java index 2c1bde10d..1f2b39713 100644 --- a/service/java/com/android/server/wifi/WifiMonitor.java +++ b/service/java/com/android/server/wifi/WifiMonitor.java @@ -594,7 +594,7 @@ public class WifiMonitor { while (true) { if (mWifiNative.connectToSupplicant()) { mConnected = true; - new MonitorThread().start(); + new MonitorThread(mWifiNative.getLocalLog()).start(); return true; } if (connectTries++ < 5) { @@ -723,10 +723,11 @@ public class WifiMonitor { } private class MonitorThread extends Thread { - private final LocalLog mLocalLog = mWifiNative.getLocalLog(); + private final LocalLog mLocalLog; - public MonitorThread() { + public MonitorThread(LocalLog localLog) { super("WifiMonitor"); + mLocalLog = localLog; } public void run() { diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java index f268f62f6..73765eeb7 100644 --- a/service/java/com/android/server/wifi/WifiNative.java +++ b/service/java/com/android/server/wifi/WifiNative.java @@ -16,6 +16,7 @@ package com.android.server.wifi; +import android.annotation.NonNull; import android.annotation.Nullable; import android.app.AlarmManager; import android.app.PendingIntent; @@ -104,7 +105,7 @@ public class WifiNative { private static final LocalLog sLocalLog = new LocalLog(8192); - public static LocalLog getLocalLog() { + public @NonNull LocalLog getLocalLog() { return sLocalLog; } |