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

Commit 623ce7f7 authored by Sreeram Ramachandran's avatar Sreeram Ramachandran Committed by Android (Google) Code Review
Browse files

Merge "Hide mutable VpnService APIs to add/remove IP addresses dynamically." into lmp-dev

parents 6f90967b a1e06807

api/current.txt

+0 −2
Original line number Original line Diff line number Diff line
@@ -17537,14 +17537,12 @@ package android.net { 
















  public class VpnService extends android.app.Service {







  public class VpnService extends android.app.Service {











    ctor public VpnService();







    ctor public VpnService();











    method public boolean addAddress(java.net.InetAddress, int);














    method public android.os.IBinder onBind(android.content.Intent);







    method public android.os.IBinder onBind(android.content.Intent);











    method public void onRevoke();







    method public void onRevoke();











    method public static android.content.Intent prepare(android.content.Context);







    method public static android.content.Intent prepare(android.content.Context);











    method public boolean protect(int);







    method public boolean protect(int);











    method public boolean protect(java.net.Socket);







    method public boolean protect(java.net.Socket);











    method public boolean protect(java.net.DatagramSocket);







    method public boolean protect(java.net.DatagramSocket);











    method public boolean removeAddress(java.net.InetAddress, int);














    field public static final java.lang.String SERVICE_INTERFACE = "android.net.VpnService";







    field public static final java.lang.String SERVICE_INTERFACE = "android.net.VpnService";











  }







  }









































core/java/android/net/VpnService.java



+4
−0




























Original line number
Original line
Diff line number
Diff line








@@ -212,6 +212,8 @@ public class VpnService extends Service {









     *







     *











     * @return {@code true} on success.







     * @return {@code true} on success.











     * @see Builder#addAddress







     * @see Builder#addAddress














     *














     * @hide











     */







     */











    public boolean addAddress(InetAddress address, int prefixLength) {







    public boolean addAddress(InetAddress address, int prefixLength) {











        check(address, prefixLength);







        check(address, prefixLength);










@@ -240,6 +242,8 @@ public class VpnService extends Service {









     * @param prefixLength The prefix length of the address.







     * @param prefixLength The prefix length of the address.











     *







     *











     * @return {@code true} on success.







     * @return {@code true} on success.














     *














     * @hide











     */







     */











    public boolean removeAddress(InetAddress address, int prefixLength) {







    public boolean removeAddress(InetAddress address, int prefixLength) {











        check(address, prefixLength);







        check(address, prefixLength);