summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Remi NGUYEN VAN <reminv@google.com> 2019-04-11 00:13:29 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2019-04-11 00:13:29 +0000
commiteb8d81ca144fd8e8ad1bbf85bc65d374c477a711 (patch)
tree9cd63c71ea099cea796d88e0367be4a97bbaa95f
parente7b20fbae90a74894cee1b9063d73d52c635bffa (diff)
parenteec0ed4056624afa8be3153756eeeba47cd10184 (diff)
Merge "Freeze netd AIDL interface (framework)"
-rw-r--r--packages/NetworkStack/src/com/android/server/NetworkObserverRegistry.java5
-rw-r--r--services/core/java/com/android/server/NetworkManagementService.java5
2 files changed, 10 insertions, 0 deletions
diff --git a/packages/NetworkStack/src/com/android/server/NetworkObserverRegistry.java b/packages/NetworkStack/src/com/android/server/NetworkObserverRegistry.java
index 6fb4b0d79a64..afe166ba9246 100644
--- a/packages/NetworkStack/src/com/android/server/NetworkObserverRegistry.java
+++ b/packages/NetworkStack/src/com/android/server/NetworkObserverRegistry.java
@@ -181,4 +181,9 @@ public class NetworkObserverRegistry extends INetdUnsolicitedEventListener.Stub
@Override
public void onStrictCleartextDetected(int uid, String hex) {}
+
+ @Override
+ public int getInterfaceVersion() {
+ return INetdUnsolicitedEventListener.VERSION;
+ }
}
diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java
index 7875e93c80f9..1ff50b240672 100644
--- a/services/core/java/com/android/server/NetworkManagementService.java
+++ b/services/core/java/com/android/server/NetworkManagementService.java
@@ -725,6 +725,11 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
ActivityManager.getService().notifyCleartextNetwork(uid,
HexDump.hexStringToByteArray(hex));
}
+
+ @Override
+ public int getInterfaceVersion() {
+ return INetdUnsolicitedEventListener.VERSION;
+ }
}
//