Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Freeze the networkstack-aidl-interfaces interface"

Browse Source 
am: 950767f9f9

Change-Id: I32e335756927110e3200f002d32f9e1e8acfd779
This commit is contained in:
Lorenzo Colitti
2019-04-23 01:45:40 -07:00
committed by android-build-merger
parent 91dab790e7 950767f9f9
commit 6c88bf9bd7
42 changed files with 306 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/NetworkStack/src/android/net/dhcp/DhcpServer.java
View File

@@ -647,4 +647,9 @@ public class DhcpServer extends IDhcpServer.Stub {
}
}
}
@Override
public int getInterfaceVersion() {
return this.VERSION;
}
}

5
packages/NetworkStack/src/android/net/ip/IpClient.java
View File

@@ -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
packages/NetworkStack/src/com/android/server/NetworkStackService.java
View File

@@ -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
packages/NetworkStack/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreService.java
View File

@@ -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
packages/NetworkStack/src/com/android/server/connectivity/ipmemorystore/RegularMaintenanceJobService.java
View File

@@ -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;

5
packages/NetworkStack/tests/src/android/net/dhcp/DhcpServerTest.java
View File

@@ -133,6 +133,11 @@ public class DhcpServerTest {
public void onStatusAvailable(int statusCode) {
assertEquals(STATUS_SUCCESS, statusCode);
}
@Override
public int getInterfaceVersion() {
return this.VERSION;
}
};
@Before

25
packages/NetworkStack/tests/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreServiceTest.java
View File

@@ -136,6 +136,11 @@ public class IpMemoryStoreServiceTest {
public IBinder asBinder() {
return null;
}
@Override
public int getInterfaceVersion() {
return this.VERSION;
}
};
}
@@ -156,6 +161,11 @@ public class IpMemoryStoreServiceTest {
public IBinder asBinder() {
return null;
}
@Override
public int getInterfaceVersion() {
return this.VERSION;
}
};
}
@@ -178,6 +188,11 @@ public class IpMemoryStoreServiceTest {
public IBinder asBinder() {
return null;
}
@Override
public int getInterfaceVersion() {
return this.VERSION;
}
};
}
@@ -200,6 +215,11 @@ public class IpMemoryStoreServiceTest {
public IBinder asBinder() {
return null;
}
@Override
public int getInterfaceVersion() {
return this.VERSION;
}
};
}
@@ -219,6 +239,11 @@ public class IpMemoryStoreServiceTest {
public IBinder asBinder() {
return null;
}
@Override
public int getInterfaceVersion() {
return this.VERSION;
}
};
}

5
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -2818,6 +2818,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
EVENT_PROVISIONING_NOTIFICATION, PROVISIONING_NOTIFICATION_HIDE,
mNai.network.netId));
}
@Override
public int getInterfaceVersion() {
return this.VERSION;
}
}
private boolean networkRequiresValidation(NetworkAgentInfo nai) {

16
services/net/Android.bp
View File

@@ -3,8 +3,6 @@ aidl_interface {
name: "ipmemorystore-aidl-interfaces",
local_include_dir: "java",
srcs: [
// TODO: Define and use a filegroup for these files, since they're also used in
// networkstack-aidl-interfaces. This does not appear to work at the moment.
"java/android/net/IIpMemoryStore.aidl",
"java/android/net/IIpMemoryStoreCallbacks.aidl",
"java/android/net/ipmemorystore/**/*.aidl",
@@ -17,17 +15,16 @@ aidl_interface {
enabled: false,
},
},
api_dir: "aidl/networkstack",
api_dir: "aidl/ipmemorystore",
versions: ["1"],
}
aidl_interface {
name: "networkstack-aidl-interfaces",
local_include_dir: "java",
include_dirs: ["frameworks/base/core/java"], // For framework parcelables.
include_dirs: ["frameworks/base/core/java"], // For framework parcelables.
srcs: [
"java/android/net/DhcpResultsParcelable.aidl",
"java/android/net/IIpMemoryStore.aidl",
"java/android/net/IIpMemoryStoreCallbacks.aidl",
"java/android/net/INetworkMonitor.aidl",
"java/android/net/INetworkMonitorCallbacks.aidl",
"java/android/net/INetworkStackConnector.aidl",
@@ -41,7 +38,6 @@ aidl_interface {
"java/android/net/dhcp/IDhcpServerCallbacks.aidl",
"java/android/net/ip/IIpClient.aidl",
"java/android/net/ip/IIpClientCallbacks.aidl",
"java/android/net/ipmemorystore/**/*.aidl",
],
backend: {
ndk: {
@@ -52,6 +48,8 @@ aidl_interface {
},
},
api_dir: "aidl/networkstack",
imports: ["ipmemorystore-aidl-interfaces"],
versions: ["1"],
}
java_library_static {
@@ -62,7 +60,7 @@ java_library_static {
"ipmemorystore-client",
"netd_aidl_interface-java",
"networkstack-aidl-interfaces-java",
]
],
}
java_library_static {
@@ -75,7 +73,7 @@ java_library_static {
],
static_libs: [
"ipmemorystore-aidl-interfaces-java",
]
],
}
filegroup {

9
services/net/aidl/ipmemorystore/1/android/net/IIpMemoryStore.aidl Normal file
View File

@@ -0,0 +1,9 @@
package android.net;
interface IIpMemoryStore {
oneway void storeNetworkAttributes(String l2Key, in android.net.ipmemorystore.NetworkAttributesParcelable attributes, android.net.ipmemorystore.IOnStatusListener listener);
oneway void storeBlob(String l2Key, String clientId, String name, in android.net.ipmemorystore.Blob data, android.net.ipmemorystore.IOnStatusListener listener);
oneway void findL2Key(in android.net.ipmemorystore.NetworkAttributesParcelable attributes, android.net.ipmemorystore.IOnL2KeyResponseListener listener);
oneway void isSameNetwork(String l2Key1, String l2Key2, android.net.ipmemorystore.IOnSameL3NetworkResponseListener listener);
oneway void retrieveNetworkAttributes(String l2Key, android.net.ipmemorystore.IOnNetworkAttributesRetrievedListener listener);
oneway void retrieveBlob(String l2Key, String clientId, String name, android.net.ipmemorystore.IOnBlobRetrievedListener listener);
}

4
services/net/aidl/ipmemorystore/1/android/net/IIpMemoryStoreCallbacks.aidl Normal file
View File

@@ -0,0 +1,4 @@
package android.net;
interface IIpMemoryStoreCallbacks {
oneway void onIpMemoryStoreFetched(in android.net.IIpMemoryStore ipMemoryStore);
}

4
services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/Blob.aidl Normal file
View File

@@ -0,0 +1,4 @@
package android.net.ipmemorystore;
parcelable Blob {
byte[] data;
}

4
services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl Normal file
View File

@@ -0,0 +1,4 @@
package android.net.ipmemorystore;
interface IOnBlobRetrievedListener {
oneway void onBlobRetrieved(in android.net.ipmemorystore.StatusParcelable status, in String l2Key, in String name, in android.net.ipmemorystore.Blob data);
}

4
services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl Normal file
View File

@@ -0,0 +1,4 @@
package android.net.ipmemorystore;
interface IOnL2KeyResponseListener {
oneway void onL2KeyResponse(in android.net.ipmemorystore.StatusParcelable status, in String l2Key);
}

4
services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl Normal file
View File

@@ -0,0 +1,4 @@
package android.net.ipmemorystore;
interface IOnNetworkAttributesRetrievedListener {
oneway void onNetworkAttributesRetrieved(in android.net.ipmemorystore.StatusParcelable status, in String l2Key, in android.net.ipmemorystore.NetworkAttributesParcelable attributes);
}

4
services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl Normal file
View File

@@ -0,0 +1,4 @@
package android.net.ipmemorystore;
interface IOnSameL3NetworkResponseListener {
oneway void onSameL3NetworkResponse(in android.net.ipmemorystore.StatusParcelable status, in android.net.ipmemorystore.SameL3NetworkResponseParcelable response);
}

4
services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnStatusListener.aidl Normal file
View File

@@ -0,0 +1,4 @@
package android.net.ipmemorystore;
interface IOnStatusListener {
oneway void onComplete(in android.net.ipmemorystore.StatusParcelable status);
}

8
services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/NetworkAttributesParcelable.aidl Normal file
View File

@@ -0,0 +1,8 @@
package android.net.ipmemorystore;
parcelable NetworkAttributesParcelable {
byte[] assignedV4Address;
long assignedV4AddressExpiry;
String groupHint;
android.net.ipmemorystore.Blob[] dnsAddresses;
int mtu;
}

6
services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl Normal file
View File

@@ -0,0 +1,6 @@
package android.net.ipmemorystore;
parcelable SameL3NetworkResponseParcelable {
String l2Key1;
String l2Key2;
float confidence;
}

4
services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/StatusParcelable.aidl Normal file
View File

@@ -0,0 +1,4 @@
package android.net.ipmemorystore;
parcelable StatusParcelable {
int resultCode;
}

8
services/net/aidl/networkstack/1/android/net/DhcpResultsParcelable.aidl Normal file
View File

@@ -0,0 +1,8 @@
package android.net;
parcelable DhcpResultsParcelable {
android.net.StaticIpConfiguration baseConfiguration;
int leaseDuration;
int mtu;
String serverAddress;
String vendorInfo;
}

17
services/net/aidl/networkstack/1/android/net/INetworkMonitor.aidl Normal file
View File

@@ -0,0 +1,17 @@
package android.net;
interface INetworkMonitor {
oneway void start();
oneway void launchCaptivePortalApp();
oneway void notifyCaptivePortalAppFinished(int response);
oneway void setAcceptPartialConnectivity();
oneway void forceReevaluation(int uid);
oneway void notifyPrivateDnsChanged(in android.net.PrivateDnsConfigParcel config);
oneway void notifyDnsResponse(int returnCode);
oneway void notifyNetworkConnected(in android.net.LinkProperties lp, in android.net.NetworkCapabilities nc);
oneway void notifyNetworkDisconnected();
oneway void notifyLinkPropertiesChanged(in android.net.LinkProperties lp);
oneway void notifyNetworkCapabilitiesChanged(in android.net.NetworkCapabilities nc);
const int NETWORK_TEST_RESULT_VALID = 0;
const int NETWORK_TEST_RESULT_INVALID = 1;
const int NETWORK_TEST_RESULT_PARTIAL_CONNECTIVITY = 2;
}

8
services/net/aidl/networkstack/1/android/net/INetworkMonitorCallbacks.aidl Normal file
View File

@@ -0,0 +1,8 @@
package android.net;
interface INetworkMonitorCallbacks {
oneway void onNetworkMonitorCreated(in android.net.INetworkMonitor networkMonitor);
oneway void notifyNetworkTested(int testResult, @nullable String redirectUrl);
oneway void notifyPrivateDnsConfigResolved(in android.net.PrivateDnsConfigParcel config);
oneway void showProvisioningNotification(String action, String packageName);
oneway void hideProvisioningNotification();
}

7
services/net/aidl/networkstack/1/android/net/INetworkStackConnector.aidl Normal file
View File

@@ -0,0 +1,7 @@
package android.net;
interface INetworkStackConnector {
oneway void makeDhcpServer(in String ifName, in android.net.dhcp.DhcpServingParamsParcel params, in android.net.dhcp.IDhcpServerCallbacks cb);
oneway void makeNetworkMonitor(in android.net.Network network, String name, in android.net.INetworkMonitorCallbacks cb);
oneway void makeIpClient(in String ifName, in android.net.ip.IIpClientCallbacks callbacks);
oneway void fetchIpMemoryStore(in android.net.IIpMemoryStoreCallbacks cb);
}

4
services/net/aidl/networkstack/1/android/net/INetworkStackStatusCallback.aidl Normal file
View File

@@ -0,0 +1,4 @@
package android.net;
interface INetworkStackStatusCallback {
oneway void onStatusAvailable(int statusCode);
}

7
services/net/aidl/networkstack/1/android/net/InitialConfigurationParcelable.aidl Normal file
View File

@@ -0,0 +1,7 @@
package android.net;
parcelable InitialConfigurationParcelable {
android.net.LinkAddress[] ipAddresses;
android.net.IpPrefix[] directlyConnectedRoutes;
String[] dnsServers;
String gateway;
}

5
services/net/aidl/networkstack/1/android/net/PrivateDnsConfigParcel.aidl Normal file
View File

@@ -0,0 +1,5 @@
package android.net;
parcelable PrivateDnsConfigParcel {
String hostname;
String[] ips;
}

15
services/net/aidl/networkstack/1/android/net/ProvisioningConfigurationParcelable.aidl Normal file
View File

@@ -0,0 +1,15 @@
package android.net;
parcelable ProvisioningConfigurationParcelable {
boolean enableIPv4;
boolean enableIPv6;
boolean usingMultinetworkPolicyTracker;
boolean usingIpReachabilityMonitor;
int requestedPreDhcpActionMs;
android.net.InitialConfigurationParcelable initialConfig;
android.net.StaticIpConfiguration staticIpConfig;
android.net.apf.ApfCapabilities apfCapabilities;
int provisioningTimeoutMs;
int ipv6AddrGenMode;
android.net.Network network;
String displayName;
}

13
services/net/aidl/networkstack/1/android/net/TcpKeepalivePacketDataParcelable.aidl Normal file
View File

@@ -0,0 +1,13 @@
package android.net;
parcelable TcpKeepalivePacketDataParcelable {
byte[] srcAddress;
int srcPort;
byte[] dstAddress;
int dstPort;
int seq;
int ack;
int rcvWnd;
int rcvWndScale;
int tos;
int ttl;
}

11
services/net/aidl/networkstack/1/android/net/dhcp/DhcpServingParamsParcel.aidl Normal file
View File

@@ -0,0 +1,11 @@
package android.net.dhcp;
parcelable DhcpServingParamsParcel {
int serverAddr;
int serverAddrPrefixLength;
int[] defaultRouters;
int[] dnsServers;
int[] excludedAddrs;
long dhcpLeaseTimeSecs;
int linkMtu;
boolean metered;
}

10
services/net/aidl/networkstack/1/android/net/dhcp/IDhcpServer.aidl Normal file
View File

@@ -0,0 +1,10 @@
package android.net.dhcp;
interface IDhcpServer {
oneway void start(in android.net.INetworkStackStatusCallback cb);
oneway void updateParams(in android.net.dhcp.DhcpServingParamsParcel params, in android.net.INetworkStackStatusCallback cb);
oneway void stop(in android.net.INetworkStackStatusCallback cb);
const int STATUS_UNKNOWN = 0;
const int STATUS_SUCCESS = 1;
const int STATUS_INVALID_ARGUMENT = 2;
const int STATUS_UNKNOWN_ERROR = 3;
}

4
services/net/aidl/networkstack/1/android/net/dhcp/IDhcpServerCallbacks.aidl Normal file
View File

@@ -0,0 +1,4 @@
package android.net.dhcp;
interface IDhcpServerCallbacks {
oneway void onDhcpServerCreated(int statusCode, in android.net.dhcp.IDhcpServer server);
}

14
services/net/aidl/networkstack/1/android/net/ip/IIpClient.aidl Normal file
View File

@@ -0,0 +1,14 @@
package android.net.ip;
interface IIpClient {
oneway void completedPreDhcpAction();
oneway void confirmConfiguration();
oneway void readPacketFilterComplete(in byte[] data);
oneway void shutdown();
oneway void startProvisioning(in android.net.ProvisioningConfigurationParcelable req);
oneway void stop();
oneway void setTcpBufferSizes(in String tcpBufferSizes);
oneway void setHttpProxy(in android.net.ProxyInfo proxyInfo);
oneway void setMulticastFilter(boolean enabled);
oneway void addKeepalivePacketFilter(int slot, in android.net.TcpKeepalivePacketDataParcelable pkt);
oneway void removeKeepalivePacketFilter(int slot);
}

16
services/net/aidl/networkstack/1/android/net/ip/IIpClientCallbacks.aidl Normal file
View File

@@ -0,0 +1,16 @@
package android.net.ip;
interface IIpClientCallbacks {
oneway void onIpClientCreated(in android.net.ip.IIpClient ipClient);
oneway void onPreDhcpAction();
oneway void onPostDhcpAction();
oneway void onNewDhcpResults(in android.net.DhcpResultsParcelable dhcpResults);
oneway void onProvisioningSuccess(in android.net.LinkProperties newLp);
oneway void onProvisioningFailure(in android.net.LinkProperties newLp);
oneway void onLinkPropertiesChange(in android.net.LinkProperties newLp);
oneway void onReachabilityLost(in String logMsg);
oneway void onQuit();
oneway void installPacketFilter(in byte[] filter);
oneway void startReadPacketFilter();
oneway void setFallbackMulticastFilter(boolean enabled);
oneway void setNeighborDiscoveryOffload(boolean enable);
}

5
services/net/java/android/net/IpMemoryStore.java
View File

@@ -41,6 +41,11 @@ public class IpMemoryStore extends IpMemoryStoreClient {
public void onIpMemoryStoreFetched(final IIpMemoryStore memoryStore) {
mService.complete(memoryStore);
}
@Override
public int getInterfaceVersion() {
return this.VERSION;
}
});
}

5
services/net/java/android/net/ip/IpClientUtil.java
View File

@@ -175,6 +175,11 @@ public class IpClientUtil {
public void setNeighborDiscoveryOffload(boolean enable) {
mCb.setNeighborDiscoveryOffload(enable);
}
@Override
public int getInterfaceVersion() {
return this.VERSION;
}
}
/**

5
services/net/java/android/net/ip/IpServer.java
View File

@@ -277,6 +277,11 @@ public class IpServer extends StateMachine {
}
public abstract void callback(int statusCode);
@Override
public int getInterfaceVersion() {
return this.VERSION;
}
}
private class DhcpServerCallbacksImpl extends DhcpServerCallbacks {

5
services/net/java/android/net/ipmemorystore/OnBlobRetrievedListener.java
View File

@@ -40,6 +40,11 @@ public interface OnBlobRetrievedListener {
listener.onBlobRetrieved(new Status(statusParcelable), l2Key, name, blob);
}
}
@Override
public int getInterfaceVersion() {
return this.VERSION;
}
};
}
}

5
services/net/java/android/net/ipmemorystore/OnL2KeyResponseListener.java
View File

@@ -40,6 +40,11 @@ public interface OnL2KeyResponseListener {
listener.onL2KeyResponse(new Status(statusParcelable), l2Key);
}
}
@Override
public int getInterfaceVersion() {
return this.VERSION;
}
};
}
}

5
services/net/java/android/net/ipmemorystore/OnNetworkAttributesRetrievedListener.java
View File

@@ -44,6 +44,11 @@ public interface OnNetworkAttributesRetrievedListener {
new NetworkAttributes(networkAttributesParcelable));
}
}
@Override
public int getInterfaceVersion() {
return this.VERSION;
}
};
}
}

5
services/net/java/android/net/ipmemorystore/OnSameL3NetworkResponseListener.java
View File

@@ -43,6 +43,11 @@ public interface OnSameL3NetworkResponseListener {
new SameL3NetworkResponse(sameL3NetworkResponseParcelable));
}
}
@Override
public int getInterfaceVersion() {
return this.VERSION;
}
};
}
}

5
services/net/java/android/net/ipmemorystore/OnStatusListener.java
View File

@@ -39,6 +39,11 @@ public interface OnStatusListener {
listener.onComplete(new Status(statusParcelable));
}
}
@Override
public int getInterfaceVersion() {
return this.VERSION;
}
};
}
}