diff options
| -rw-r--r-- | service/java/com/android/server/wifi/WifiVendorHal.java | 6 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/service/java/com/android/server/wifi/WifiVendorHal.java b/service/java/com/android/server/wifi/WifiVendorHal.java index b91425ef6..454c0bc35 100644 --- a/service/java/com/android/server/wifi/WifiVendorHal.java +++ b/service/java/com/android/server/wifi/WifiVendorHal.java @@ -189,9 +189,7 @@ public class WifiVendorHal { */ private WifiLog.LogMessage enter(String format) { if (mVerboseLog == sNoLog) return sNoLog.info(format); - Thread cur = Thread.currentThread(); - StackTraceElement[] trace = cur.getStackTrace(); - return mVerboseLog.trace("% " + format).c(trace[3].getMethodName()); + return mVerboseLog.trace(format, 1); } /** @@ -201,7 +199,7 @@ public class WifiVendorHal { * * @param trace, fo example obtained by Thread.currentThread().getStackTrace() * @param start frame number to log, typically 3 - * @return string cotaining the method name and line number + * @return string containing the method name and line number */ private static String niceMethodName(StackTraceElement[] trace, int start) { if (start >= trace.length) return ""; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java b/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java index 875cd1b76..5d9e442f0 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java @@ -588,7 +588,7 @@ public class WifiVendorHalTest { mWifiVendorHal.mLog = spy(mWifiLog); mWifiVendorHal.enableVerboseLogging(true); mWifiVendorHal.installPacketFilter(TEST_IFACE_NAME, new byte[0]); - verify(mWifiVendorHal.mLog).trace(eq("% filter length %")); + verify(mWifiVendorHal.mLog).trace(eq("filter length %"), eq(1)); } /** @@ -601,7 +601,7 @@ public class WifiVendorHalTest { mWifiVendorHal.enableVerboseLogging(true); mWifiVendorHal.enableVerboseLogging(false); mWifiVendorHal.installPacketFilter(TEST_IFACE_NAME, new byte[0]); - verify(mWifiVendorHal.mLog, never()).trace(eq("% filter length %")); + verify(mWifiVendorHal.mLog, never()).trace(eq("filter length %"), anyInt()); } /** |