Merge "WifiManager: Add verbose logging enabled flag" (5f077bb6) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/WifiManager.java

+22 −6

Original line number	Diff line number	Diff line
		@@ -981,6 +981,7 @@ public class WifiManager {
		private AsyncChannel mAsyncChannel;
		private CountDownLatch mConnected;
		private Looper mLooper;
		private boolean mVerboseLoggingEnabled = false;

		/* LocalOnlyHotspot callback message types */
		/** @hide */
		@@ -1013,6 +1014,7 @@ public class WifiManager {
		mService = service;
		mLooper = looper;
		mTargetSdkVersion = context.getApplicationInfo().targetSdkVersion;
		updateVerboseLoggingEnabledFromService();
		}

		/**
		@@ -2475,7 +2477,7 @@ public class WifiManager {
		*
		* @hide
		*/
		private static class SoftApCallbackProxy extends ISoftApCallback.Stub {
		private class SoftApCallbackProxy extends ISoftApCallback.Stub {
		private final Handler mHandler;
		private final SoftApCallback mCallback;

		@@ -2486,8 +2488,10 @@ public class WifiManager {

		@Override
		public void onStateChanged(int state, int failureReason) {
		Log.v(TAG, "SoftApCallbackProxy: onStateChanged: state=" + state + ", failureReason=" +
		failureReason);
		if (mVerboseLoggingEnabled) {
		Log.v(TAG, "SoftApCallbackProxy: onStateChanged: state=" + state
		+ ", failureReason=" + failureReason);
		}
		mHandler.post(() -> {
		mCallback.onStateChanged(state, failureReason);
		});
		@@ -2495,7 +2499,9 @@ public class WifiManager {

		@Override
		public void onNumClientsChanged(int numClients) {
		if (mVerboseLoggingEnabled) {
		Log.v(TAG, "SoftApCallbackProxy: onNumClientsChanged: numClients=" + numClients);
		}
		mHandler.post(() -> {
		mCallback.onNumClientsChanged(numClients);
		});
		@@ -3786,7 +3792,7 @@ public class WifiManager {
		*
		* @hide
		*/
		private static class TrafficStateCallbackProxy extends ITrafficStateCallback.Stub {
		private class TrafficStateCallbackProxy extends ITrafficStateCallback.Stub {
		private final Handler mHandler;
		private final TrafficStateCallback mCallback;

		@@ -3797,7 +3803,9 @@ public class WifiManager {

		@Override
		public void onStateChanged(int state) {
		if (mVerboseLoggingEnabled) {
		Log.v(TAG, "TrafficStateCallbackProxy: onStateChanged state=" + state);
		}
		mHandler.post(() -> {
		mCallback.onStateChanged(state);
		});
		@@ -3854,4 +3862,12 @@ public class WifiManager {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Helper method to update the local verbose logging flag based on the verbose logging
		* level from wifi service.
		*/
		private void updateVerboseLoggingEnabledFromService() {
		mVerboseLoggingEnabled = getVerboseLoggingLevel() > 0;
		}
		}

wifi/tests/src/android/net/wifi/WifiManagerTest.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -93,6 +93,7 @@ public class WifiManagerTest {

		mWifiServiceMessenger = new Messenger(mHandler);
		mWifiManager = new WifiManager(mContext, mWifiService, mLooper.getLooper());
		verify(mWifiService).getVerboseLoggingLevel();
		}

		/**