From 28011a418050bfd2744a147fc177bc30f747c26c Mon Sep 17 00:00:00 2001
From: dalyk <dalyk@google.com>
Date: Thu, 8 Mar 2018 16:33:25 -0500
Subject: [PATCH] Add BaseNetdEventCallback class that provides no-op
 implementations for INetdEventCallback.

Test: None
Bug: 71828272
Merged-In: I261015d0d3e7e4159bb514742a6c588bfd34e795
Merged-In: I3a701fc52641615bf197f980022a61518c7347f4
Merged-In: I1ed5ede74ca14718e6d4f8a9a8d57de6026c9e93
Merged-In: Ib0c4b69a24144d27f672ec716fb9a8f06987ce7d
Change-Id: I75e0620f82195f18befe9dc079492a8c69bb764b
(cherry picked from commit 985d89a6e0412a3b0e8b1519de8ebffdbf708d31)
---
 .../server/net/BaseNetdEventCallback.java     | 38 +++++++++++++++++++
 .../server/devicepolicy/NetworkLogger.java    |  3 +-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 core/java/com/android/server/net/BaseNetdEventCallback.java

diff --git a/core/java/com/android/server/net/BaseNetdEventCallback.java b/core/java/com/android/server/net/BaseNetdEventCallback.java
new file mode 100644
index 0000000000000..3d3a3d07b2163
--- /dev/null
+++ b/core/java/com/android/server/net/BaseNetdEventCallback.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.net;
+
+import android.net.INetdEventCallback;
+
+/**
+ * Base {@link INetdEventCallback} that provides no-op
+ * implementations which can be overridden.
+ *
+ * @hide
+ */
+public class BaseNetdEventCallback extends INetdEventCallback.Stub {
+    @Override
+    public void onDnsEvent(String hostname, String[] ipAddresses,
+            int ipAddressesCount, long timestamp, int uid) {
+        // default no-op
+    }
+
+    @Override
+    public void onConnectEvent(String ipAddr, int port, long timestamp, int uid) {
+        // default no-op
+    }
+}
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/NetworkLogger.java b/services/devicepolicy/java/com/android/server/devicepolicy/NetworkLogger.java
index 0aaf32cbe275b..0967652fb215b 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/NetworkLogger.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/NetworkLogger.java
@@ -30,6 +30,7 @@ import android.util.Log;
 import android.util.Slog;
 
 import com.android.server.ServiceThread;
+import com.android.server.net.BaseNetdEventCallback;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -50,7 +51,7 @@ final class NetworkLogger {
     private ServiceThread mHandlerThread;
     private NetworkLoggingHandler mNetworkLoggingHandler;
 
-    private final INetdEventCallback mNetdEventCallback = new INetdEventCallback.Stub() {
+    private final INetdEventCallback mNetdEventCallback = new BaseNetdEventCallback() {
         @Override
         public void onDnsEvent(String hostname, String[] ipAddresses, int ipAddressesCount,
                 long timestamp, int uid) {