Merge "Fix : recent Connectivity module with old NetworkStack module" (06e4a5da) · Commits · e / os / android_packages_modules_NetworkStack

common/networkstackclient/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -193,6 +193,7 @@ java_library {
		],
		static_libs: [
		"networkstack-aidl-latest",
		"modules-utils-build",
		],
		visibility: [
		"//frameworks/base/packages/Connectivity/service",

+8 −1

Original line number	Diff line number	Diff line
		@@ -23,6 +23,8 @@ import android.os.Binder;
		import android.os.RemoteException;
		import android.util.Log;

		import com.android.modules.utils.build.SdkLevel;

		/**
		* A convenience wrapper for INetworkMonitor.
		*
		@@ -151,7 +153,12 @@ public class NetworkMonitorManager {
		public boolean notifyNetworkConnected(NetworkMonitorParameters params) {
		final long token = Binder.clearCallingIdentity();
		try {
		if (SdkLevel.isAtLeastT()) {
		mNetworkMonitor.notifyNetworkConnectedParcel(params);
		} else {
		mNetworkMonitor.notifyNetworkConnected(params.linkProperties,
		params.networkCapabilities);
		}
		return true;
		} catch (RemoteException e) {
		log("Error in notifyNetworkConnected", e);

+1 −2

Original line number	Diff line number	Diff line
		@@ -693,8 +693,7 @@ public class NetworkMonitor extends StateMachine {

		/**
		* Send a notification to NetworkMonitor indicating that the network is now connected.
		* @Deprecated use notifyNetworkConnectedParcel. This method is called on R-, or in
		* cases where the Connectivity module is old in S.
		* @Deprecated use notifyNetworkConnectedParcel. This method is called on S-.
		*/
		public void notifyNetworkConnected(LinkProperties lp, NetworkCapabilities nc) {
		final NetworkMonitorParameters params = new NetworkMonitorParameters();