From 5155a2d7e44dfa6b85f429b8b492c12a9465f8d1 Mon Sep 17 00:00:00 2001 From: Irina Dumitrescu Date: Wed, 20 Feb 2019 18:17:06 +0000 Subject: [PATCH] Add @NonNull annotation to set proxy on VPN parameter. Test: manual Bug: 124883120 Change-Id: Ifb4bd98a69a006220b1a824033395fc6f12ea6ce --- api/current.txt | 2 +- core/java/android/net/VpnService.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/api/current.txt b/api/current.txt index d9d61b5dbeed8..84f209c4b89f4 100755 --- a/api/current.txt +++ b/api/current.txt @@ -27855,7 +27855,7 @@ package android.net { method public android.os.ParcelFileDescriptor establish(); method public android.net.VpnService.Builder setBlocking(boolean); method public android.net.VpnService.Builder setConfigureIntent(android.app.PendingIntent); - method public android.net.VpnService.Builder setHttpProxy(android.net.ProxyInfo); + method public android.net.VpnService.Builder setHttpProxy(@NonNull android.net.ProxyInfo); method public android.net.VpnService.Builder setMetered(boolean); method public android.net.VpnService.Builder setMtu(int); method public android.net.VpnService.Builder setSession(String); diff --git a/core/java/android/net/VpnService.java b/core/java/android/net/VpnService.java index 784f233111033..ebb1ae4bb795c 100644 --- a/core/java/android/net/VpnService.java +++ b/core/java/android/net/VpnService.java @@ -19,6 +19,7 @@ package android.net; import static android.system.OsConstants.AF_INET; import static android.system.OsConstants.AF_INET6; +import android.annotation.NonNull; import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.annotation.UnsupportedAppUsage; @@ -512,7 +513,7 @@ public class VpnService extends Service { * Sets an HTTP proxy for the VPN network. This proxy is only a recommendation * and it is possible that some apps will ignore it. */ - public Builder setHttpProxy(ProxyInfo proxyInfo) { + public Builder setHttpProxy(@NonNull ProxyInfo proxyInfo) { mConfig.proxyInfo = proxyInfo; return this; }