From eec0ed4056624afa8be3153756eeeba47cd10184 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Tue, 9 Apr 2019 14:01:51 +0900 Subject: [PATCH] Freeze netd AIDL interface (framework) This freezes the interface as of the latest beta build, although it has not changed since then. This change adds the necessary implementations for getInterfaceVersion. Test: flashed, WiFi working Bug: 128803828 Change-Id: I43a6a38685d5fbc669cd573c4d7e7f99bd596952 --- .../src/com/android/server/NetworkObserverRegistry.java | 5 +++++ .../java/com/android/server/NetworkManagementService.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/packages/NetworkStack/src/com/android/server/NetworkObserverRegistry.java b/packages/NetworkStack/src/com/android/server/NetworkObserverRegistry.java index 6fb4b0d79a644..afe166ba92464 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 7875e93c80f9f..1ff50b240672e 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; + } } //