Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 121dab8e authored by Irina Dumitrescu's avatar Irina Dumitrescu Committed by android-build-merger
Browse files

Merge "Add @NonNull annotation to set proxy on VPN parameter." 

am: 909baedd

Change-Id: I0213524c6b71576bafb46e5b9378c3f43a325888
parents 588413cf 909baedd

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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);

core/java/android/net/VpnService.java

+2 −1
Original line number Diff line number Diff line
@@ -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;

        }