Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6080999e authored Feb 04, 2021 by Chiachang Wang

[IT06]Move INetworkActivityListener into connectivity module

INetworkActivityListener is hidden and the only usage is inside
the connectivity module. Thus, move this into module scope.

Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: I0a75c440c1daa773217bbd362b212fda4d07ec64

parent be5d0935

packages/Connectivity/framework/src/android/net/ConnectivityManager.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -49,7 +49,6 @@ import android.os.Build.VERSION_CODES;
	import android.os.Bundle;		import android.os.Bundle;
	import android.os.Handler;		import android.os.Handler;
	import android.os.IBinder;		import android.os.IBinder;
	import android.os.INetworkActivityListener;
	import android.os.Looper;		import android.os.Looper;
	import android.os.Message;		import android.os.Message;
	import android.os.Messenger;		import android.os.Messenger;

packages/Connectivity/framework/src/android/net/IConnectivityManager.aidl

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@ import android.net.ConnectionInfo;
	import android.net.ConnectivityDiagnosticsManager;		import android.net.ConnectivityDiagnosticsManager;
	import android.net.IConnectivityDiagnosticsCallback;		import android.net.IConnectivityDiagnosticsCallback;
	import android.net.IOnSetOemNetworkPreferenceListener;		import android.net.IOnSetOemNetworkPreferenceListener;
			import android.net.INetworkActivityListener;
	import android.net.IQosCallback;		import android.net.IQosCallback;
	import android.net.ISocketKeepaliveCallback;		import android.net.ISocketKeepaliveCallback;
	import android.net.LinkProperties;		import android.net.LinkProperties;
	@@ -36,7 +37,6 @@ import android.net.UidRange;
	import android.net.QosSocketInfo;		import android.net.QosSocketInfo;
	import android.os.Bundle;		import android.os.Bundle;
	import android.os.IBinder;		import android.os.IBinder;
	import android.os.INetworkActivityListener;
	import android.os.Messenger;		import android.os.Messenger;
	import android.os.ParcelFileDescriptor;		import android.os.ParcelFileDescriptor;
	import android.os.PersistableBundle;		import android.os.PersistableBundle;

core/java/android/os/INetworkActivityListener.aidl→packages/Connectivity/framework/src/android/net/INetworkActivityListener.aidl

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -13,7 +13,7 @@
	** limitations under the License.		** limitations under the License.
	*/		*/

	package android.os;		package android.net;

	/**		/**
	* @hide		* @hide

services/core/java/com/android/server/ConnectivityService.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -90,6 +90,7 @@ import android.net.IConnectivityDiagnosticsCallback;
	import android.net.IConnectivityManager;		import android.net.IConnectivityManager;
	import android.net.IDnsResolver;		import android.net.IDnsResolver;
	import android.net.INetd;		import android.net.INetd;
			import android.net.INetworkActivityListener;
	import android.net.INetworkManagementEventObserver;		import android.net.INetworkManagementEventObserver;
	import android.net.INetworkMonitor;		import android.net.INetworkMonitor;
	import android.net.INetworkMonitorCallbacks;		import android.net.INetworkMonitorCallbacks;
	@@ -154,7 +155,6 @@ import android.os.Bundle;
	import android.os.Handler;		import android.os.Handler;
	import android.os.HandlerThread;		import android.os.HandlerThread;
	import android.os.IBinder;		import android.os.IBinder;
	import android.os.INetworkActivityListener;
	import android.os.INetworkManagementService;		import android.os.INetworkManagementService;
	import android.os.Looper;		import android.os.Looper;
	import android.os.Message;		import android.os.Message;