commit 22580b83f18b572707ea47f99cb9016f067b89f8
author Jason Sams <jsams@google.com> Thu Mar 26 22:10:46 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 26 22:10:47 2015 +0000
tree 242f88dcac1e414ec0d74d6301565fb1a17df090
parent 727cac07cc823f4a21be420aa33da6369b390c54
parent ae5be38ebbfdfa3a6ff18a5ced00e57adefd7348

Merge "Fix potential npe"

services/core/java/com/android/server/connectivity/Vpn.java

diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index 8533f69..3174e69 100644
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -1009,6 +1009,14 @@
     public synchronized LegacyVpnInfo getLegacyVpnInfo() {
         // Check if the caller is authorized.
         enforceControlPermission();
+        return getLegacyVpnInfoPrivileged();
+    }
+
+    /**
+     * Return the information of the current ongoing legacy VPN.
+     * Callers are responsible for checking permissions if needed.
+     */
+    public synchronized LegacyVpnInfo getLegacyVpnInfoPrivileged() {
         if (mLegacyVpnRunner == null) return null;
 
         final LegacyVpnInfo info = new LegacyVpnInfo();