commit 4e37b7044018153bf294a0e9e834681c46c050d7
author Erik Kline <ek@google.com> Tue Jul 05 11:34:21 2016 +0900
committer Erik Kline <ek@google.com> Wed Jul 06 19:32:01 2016 +0900
tree 9607f068609ab8a67801bf4ed638b02ae43ef46e
parent 018a2058246d1f034d25adbd69502e6b2eb81fc7

[net mgmt svc] add method to retrieve INetd reference

Bug: 21859053
Bug: 28135208
Change-Id: Idfb5ca65788ae8c7aea91f12d9d461686ad836d6

services/core/java/com/android/server/NetworkManagementService.java

diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java
index f236877..be9d836 100644
--- a/services/core/java/com/android/server/NetworkManagementService.java
+++ b/services/core/java/com/android/server/NetworkManagementService.java
@@ -971,6 +971,17 @@
     //
     // INetworkManagementService members
     //
+    @Override
+    public INetd getNetdService() throws RemoteException {
+        final CountDownLatch connectedSignal = mConnectedSignal;
+        if (connectedSignal != null) {
+            try {
+                connectedSignal.await();
+            } catch (InterruptedException ignored) {}
+        }
+
+        return mNetdService;
+    }
 
     @Override
     public String[] listInterfaces() {