commit 4c9f954d2bcf108ad2ad496a4e4a290f69ee7f16
author Lorenzo Colitti <lorenzo@google.com> Fri Apr 12 10:48:06 2019 +0000
committer Lorenzo Colitti <lorenzo@google.com> Fri Apr 12 19:52:32 2019 +0900
tree 84e92341bee8d1878519f86434c041d7ce562a24
parent 6617bf81c928b803fecd896738867067f3932d5f

Revert "Revert "Block incoming non-VPN packets to apps under fully-routed VPN""

This reverts commit 3897df2e36d4d015304b398c545c1232ee35a1c9.

Reason for revert: Rolling forward, will fix tests in same CL stack.

Bug: 114231106
Bug: 130397860
Test: FrameworksNetTests
Change-Id: Ia8a0c99b4e1fd5dff26c881715cd876618ca4321

core/java/android/net/NetworkCapabilities.java

diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java
index 99375f8..dfd7089 100644
--- a/core/java/android/net/NetworkCapabilities.java
+++ b/core/java/android/net/NetworkCapabilities.java
@@ -822,6 +822,11 @@
         mEstablishingVpnAppUid = uid;
     }
 
+    /** @hide */
+    public int getEstablishingVpnAppUid() {
+        return mEstablishingVpnAppUid;
+    }
+
     /**
      * Value indicating that link bandwidth is unspecified.
      * @hide