Merge "Freeze the networkstack-aidl-interfaces interface" am: 950767f9f9 (9b89cdaa) · Commits · e / os / android_frameworks_base

packages/NetworkStack/src/android/net/dhcp/DhcpServer.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -647,4 +647,9 @@ public class DhcpServer extends IDhcpServer.Stub {
		}
		}
		}

		@Override
		public int getInterfaceVersion() {
		return this.VERSION;
		}
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -557,6 +557,11 @@ public class IpClient extends StateMachine {
		checkNetworkStackCallingPermission();
		IpClient.this.removeKeepalivePacketFilter(slot);
		}

		@Override
		public int getInterfaceVersion() {
		return this.VERSION;
		}
		}

		public String getInterfaceName() {

+10 −0

Original line number	Diff line number	Diff line
		@@ -251,6 +251,11 @@ public class NetworkStackService extends Service {
		}
		}
		}

		@Override
		public int getInterfaceVersion() {
		return this.VERSION;
		}
		}

		private static class NetworkMonitorImpl extends INetworkMonitor.Stub {
		@@ -325,5 +330,10 @@ public class NetworkStackService extends Service {
		checkNetworkStackCallingPermission();
		mNm.notifyNetworkCapabilitiesChanged(nc);
		}

		@Override
		public int getInterfaceVersion() {
		return this.VERSION;
		}
		}
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -494,4 +494,9 @@ public class IpMemoryStoreService extends IIpMemoryStore.Stub {
		listener.onComplete(makeStatus(ERROR_INTERNAL_INTERRUPTED));
		return true;
		}

		@Override
		public int getInterfaceVersion() {
		return this.VERSION;
		}
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -90,6 +90,11 @@ public final class RegularMaintenanceJobService extends JobService {
		jobFinished(params, !result.isSuccess());
		}

		@Override
		public int getInterfaceVersion() {
		return this.VERSION;
		}

		@Override
		public IBinder asBinder() {
		return null;