diff options
author | mukesh agrawal <quiche@google.com> | 2016-07-28 17:32:29 -0700 |
---|---|---|
committer | mukesh agrawal <quiche@google.com> | 2016-08-02 18:09:24 -0700 |
commit | 63fad8b4722c94ce9107690b647cdbe7e8a1c4f9 (patch) | |
tree | de31e53366456cbf4af1966bed334415a7284d0e /service/java/com | |
parent | d68fa5a0cb9715a20cc06010b40ccbe6ba8cb64c (diff) | |
download | wifi-63fad8b4722c94ce9107690b647cdbe7e8a1c4f9.tar.gz |
WifiDiagnostics: test a log call
Use WifiDiagnosticss to add an example of how to
test logging calls.
And to facilitate this: add a makeLog() method
to WifiInjector.
BUG=30566702
TEST=wifitests/runtests.sh
Change-Id: I46ebd8e79c90bce4bb75c077a6e6cc2b0aa9d3ee
Diffstat (limited to 'service/java/com')
-rw-r--r-- | service/java/com/android/server/wifi/WifiDiagnostics.java | 6 | ||||
-rw-r--r-- | service/java/com/android/server/wifi/WifiInjector.java | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/service/java/com/android/server/wifi/WifiDiagnostics.java b/service/java/com/android/server/wifi/WifiDiagnostics.java index 3a7302221..cde8fdf8d 100644 --- a/service/java/com/android/server/wifi/WifiDiagnostics.java +++ b/service/java/com/android/server/wifi/WifiDiagnostics.java @@ -108,8 +108,8 @@ class WifiDiagnostics extends BaseWifiDiagnostics { private int mMaxRingBufferSizeBytes; private WifiLog mLog; - public WifiDiagnostics(Context context, WifiStateMachine wifiStateMachine, WifiNative wifiNative, - BuildProperties buildProperties) { + public WifiDiagnostics(Context context, WifiInjector wifiInjector, WifiStateMachine wifiStateMachine, + WifiNative wifiNative, BuildProperties buildProperties) { RING_BUFFER_BYTE_LIMIT_SMALL = context.getResources().getInteger( R.integer.config_wifi_logger_ring_buffer_default_size_limit_kb) * 1024; RING_BUFFER_BYTE_LIMIT_LARGE = context.getResources().getInteger( @@ -120,7 +120,7 @@ class WifiDiagnostics extends BaseWifiDiagnostics { mBuildProperties = buildProperties; mIsLoggingEventHandlerRegistered = false; mMaxRingBufferSizeBytes = RING_BUFFER_BYTE_LIMIT_SMALL; - mLog = new LogcatLog(TAG); + mLog = wifiInjector.makeLog(TAG); } @Override diff --git a/service/java/com/android/server/wifi/WifiInjector.java b/service/java/com/android/server/wifi/WifiInjector.java index 41a800f5d..4865e6b51 100644 --- a/service/java/com/android/server/wifi/WifiInjector.java +++ b/service/java/com/android/server/wifi/WifiInjector.java @@ -240,9 +240,18 @@ public class WifiInjector { allowed2GChannels, listener, apInterface); } + /** + * Create a WifiLog instance. + * @param tag module name to include in all log messages + */ + public WifiLog makeLog(String tag) { + return new LogcatLog(tag); + } + public BaseWifiDiagnostics makeWifiDiagnostics(WifiNative wifiNative) { if (mUseRealLogger) { - return new WifiDiagnostics(mContext, mWifiStateMachine, wifiNative, mBuildProperties); + return new WifiDiagnostics( + mContext, this, mWifiStateMachine, wifiNative, mBuildProperties); } else { return new BaseWifiDiagnostics(); } |