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

Commit bd62d6af authored by Nathan Harold's avatar Nathan Harold
Browse files

Hide IpSecManager, IpSecTransform, and IpSecAlgorithm 

These classes, originally planned to be part of the
public API, are not ready for public consumption.
They are planned to be un-hidden in a future release.

Bug: 37681043
Test: make update-api and make
Merged-In: I8caccd3f8455341cb56a2256354eacbadedff047
Change-Id: I8caccd3f8455341cb56a2256354eacbadedff047
(cherry picked from commit e38565fc74ee19e27175782be3cf2f0dffefd3a6)
parent 26ba9f88

api/current.txt

+0 −61
Original line number Original line Diff line number Diff line
@@ -8951,7 +8951,6 @@ package android.content { 
    field public static final java.lang.String HARDWARE_PROPERTIES_SERVICE = "hardware_properties";

    field public static final java.lang.String HARDWARE_PROPERTIES_SERVICE = "hardware_properties";

    field public static final java.lang.String INPUT_METHOD_SERVICE = "input_method";

    field public static final java.lang.String INPUT_METHOD_SERVICE = "input_method";

    field public static final java.lang.String INPUT_SERVICE = "input";

    field public static final java.lang.String INPUT_SERVICE = "input";

    field public static final java.lang.String IPSEC_SERVICE = "ipsec";

    field public static final java.lang.String JOB_SCHEDULER_SERVICE = "jobscheduler";

    field public static final java.lang.String JOB_SCHEDULER_SERVICE = "jobscheduler";

    field public static final java.lang.String KEYGUARD_SERVICE = "keyguard";

    field public static final java.lang.String KEYGUARD_SERVICE = "keyguard";

    field public static final java.lang.String LAUNCHER_APPS_SERVICE = "launcherapps";

    field public static final java.lang.String LAUNCHER_APPS_SERVICE = "launcherapps";
@@ -25494,66 +25493,6 @@ package android.net { 
    field public static final android.os.Parcelable.Creator<android.net.IpPrefix> CREATOR;

    field public static final android.os.Parcelable.Creator<android.net.IpPrefix> CREATOR;

  }

  }

















  public final class IpSecAlgorithm implements android.os.Parcelable {














    ctor public IpSecAlgorithm(java.lang.String, byte[]);














    ctor public IpSecAlgorithm(java.lang.String, byte[], int);














    method public int describeContents();














    method public byte[] getKey();














    method public java.lang.String getName();














    method public int getTruncationLengthBits();














    method public void writeToParcel(android.os.Parcel, int);














    field public static final java.lang.String AUTH_HMAC_MD5 = "hmac(md5)";














    field public static final java.lang.String AUTH_HMAC_SHA1 = "hmac(sha1)";














    field public static final java.lang.String AUTH_HMAC_SHA256 = "hmac(sha256)";














    field public static final java.lang.String AUTH_HMAC_SHA384 = "hmac(sha384)";














    field public static final java.lang.String AUTH_HMAC_SHA512 = "hmac(sha512)";














    field public static final android.os.Parcelable.Creator<android.net.IpSecAlgorithm> CREATOR;














    field public static final java.lang.String CRYPT_AES_CBC = "cbc(aes)";














  }



























  public final class IpSecManager {














    method public void applyTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform) throws java.io.IOException;














    method public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket(int) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;














    method public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket() throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;














    method public void removeTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform) throws java.io.IOException;














    method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(int, java.net.InetAddress) throws android.net.IpSecManager.ResourceUnavailableException;














    method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(int, java.net.InetAddress, int) throws android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;














    field public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; // 0x0














  }



























  public static final class IpSecManager.ResourceUnavailableException extends android.util.AndroidException {














  }



























  public static final class IpSecManager.SecurityParameterIndex implements java.lang.AutoCloseable {














    method public void close();














    method public int getSpi();














  }



























  public static final class IpSecManager.SpiUnavailableException extends android.util.AndroidException {














    method public int getSpi();














  }



























  public static final class IpSecManager.UdpEncapsulationSocket implements java.lang.AutoCloseable {














    method public void close() throws java.io.IOException;














    method public int getPort();














    method public java.io.FileDescriptor getSocket();














  }



























  public final class IpSecTransform implements java.lang.AutoCloseable {














    method public void close();














    field public static final int DIRECTION_IN = 0; // 0x0














    field public static final int DIRECTION_OUT = 1; // 0x1














  }



























  public static class IpSecTransform.Builder {














    ctor public IpSecTransform.Builder(android.content.Context);














    method public android.net.IpSecTransform buildTransportModeTransform(java.net.InetAddress) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;














    method public android.net.IpSecTransform.Builder setAuthentication(int, android.net.IpSecAlgorithm);














    method public android.net.IpSecTransform.Builder setEncryption(int, android.net.IpSecAlgorithm);














    method public android.net.IpSecTransform.Builder setIpv4Encapsulation(android.net.IpSecManager.UdpEncapsulationSocket, int);














    method public android.net.IpSecTransform.Builder setSpi(int, android.net.IpSecManager.SecurityParameterIndex);














  }



























  public class LinkAddress implements android.os.Parcelable {







  public class LinkAddress implements android.os.Parcelable {











    method public int describeContents();







    method public int describeContents();











    method public java.net.InetAddress getAddress();







    method public java.net.InetAddress getAddress();

























api/system-current.txt



+0
−63




























Original line number
Original line
Diff line number
Diff line








@@ -9458,7 +9458,6 @@ package android.content {









    field public static final java.lang.String HDMI_CONTROL_SERVICE = "hdmi_control";







    field public static final java.lang.String HDMI_CONTROL_SERVICE = "hdmi_control";











    field public static final java.lang.String INPUT_METHOD_SERVICE = "input_method";







    field public static final java.lang.String INPUT_METHOD_SERVICE = "input_method";











    field public static final java.lang.String INPUT_SERVICE = "input";







    field public static final java.lang.String INPUT_SERVICE = "input";











    field public static final java.lang.String IPSEC_SERVICE = "ipsec";














    field public static final java.lang.String JOB_SCHEDULER_SERVICE = "jobscheduler";







    field public static final java.lang.String JOB_SCHEDULER_SERVICE = "jobscheduler";











    field public static final java.lang.String KEYGUARD_SERVICE = "keyguard";







    field public static final java.lang.String KEYGUARD_SERVICE = "keyguard";











    field public static final java.lang.String LAUNCHER_APPS_SERVICE = "launcherapps";







    field public static final java.lang.String LAUNCHER_APPS_SERVICE = "launcherapps";










@@ -27684,68 +27683,6 @@ package android.net {









    field public static final android.os.Parcelable.Creator<android.net.IpPrefix> CREATOR;







    field public static final android.os.Parcelable.Creator<android.net.IpPrefix> CREATOR;











  }







  }



























  public final class IpSecAlgorithm implements android.os.Parcelable {














    ctor public IpSecAlgorithm(java.lang.String, byte[]);














    ctor public IpSecAlgorithm(java.lang.String, byte[], int);














    method public int describeContents();














    method public byte[] getKey();














    method public java.lang.String getName();














    method public int getTruncationLengthBits();














    method public void writeToParcel(android.os.Parcel, int);














    field public static final java.lang.String AUTH_HMAC_MD5 = "hmac(md5)";














    field public static final java.lang.String AUTH_HMAC_SHA1 = "hmac(sha1)";














    field public static final java.lang.String AUTH_HMAC_SHA256 = "hmac(sha256)";














    field public static final java.lang.String AUTH_HMAC_SHA384 = "hmac(sha384)";














    field public static final java.lang.String AUTH_HMAC_SHA512 = "hmac(sha512)";














    field public static final android.os.Parcelable.Creator<android.net.IpSecAlgorithm> CREATOR;














    field public static final java.lang.String CRYPT_AES_CBC = "cbc(aes)";














  }



























  public final class IpSecManager {














    method public void applyTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform) throws java.io.IOException;














    method public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket(int) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;














    method public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket() throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;














    method public void removeTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform) throws java.io.IOException;














    method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(int, java.net.InetAddress) throws android.net.IpSecManager.ResourceUnavailableException;














    method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(int, java.net.InetAddress, int) throws android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;














    field public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; // 0x0














  }



























  public static final class IpSecManager.ResourceUnavailableException extends android.util.AndroidException {














  }



























  public static final class IpSecManager.SecurityParameterIndex implements java.lang.AutoCloseable {














    method public void close();














    method public int getSpi();














  }



























  public static final class IpSecManager.SpiUnavailableException extends android.util.AndroidException {














    method public int getSpi();














  }



























  public static final class IpSecManager.UdpEncapsulationSocket implements java.lang.AutoCloseable {














    method public void close() throws java.io.IOException;














    method public int getPort();














    method public java.io.FileDescriptor getSocket();














  }



























  public final class IpSecTransform implements java.lang.AutoCloseable {














    method public void close();














    field public static final int DIRECTION_IN = 0; // 0x0














    field public static final int DIRECTION_OUT = 1; // 0x1














  }



























  public static class IpSecTransform.Builder {














    ctor public IpSecTransform.Builder(android.content.Context);














    method public android.net.IpSecTransform buildTransportModeTransform(java.net.InetAddress) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;














    method public android.net.IpSecTransform.Builder setAuthentication(int, android.net.IpSecAlgorithm);














    method public android.net.IpSecTransform.Builder setEncryption(int, android.net.IpSecAlgorithm);














    method public android.net.IpSecTransform.Builder setIpv4Encapsulation(android.net.IpSecManager.UdpEncapsulationSocket, int);














    method public android.net.IpSecTransform.Builder setNattKeepalive(int);














    method public android.net.IpSecTransform.Builder setSpi(int, android.net.IpSecManager.SecurityParameterIndex);














    method public android.net.IpSecTransform.Builder setUnderlyingNetwork(android.net.Network);














  }



























  public class LinkAddress implements android.os.Parcelable {







  public class LinkAddress implements android.os.Parcelable {











    method public int describeContents();







    method public int describeContents();











    method public java.net.InetAddress getAddress();







    method public java.net.InetAddress getAddress();

























api/test-current.txt



+0
−61




























Original line number
Original line
Diff line number
Diff line








@@ -8984,7 +8984,6 @@ package android.content {









    field public static final java.lang.String HARDWARE_PROPERTIES_SERVICE = "hardware_properties";







    field public static final java.lang.String HARDWARE_PROPERTIES_SERVICE = "hardware_properties";











    field public static final java.lang.String INPUT_METHOD_SERVICE = "input_method";







    field public static final java.lang.String INPUT_METHOD_SERVICE = "input_method";











    field public static final java.lang.String INPUT_SERVICE = "input";







    field public static final java.lang.String INPUT_SERVICE = "input";











    field public static final java.lang.String IPSEC_SERVICE = "ipsec";














    field public static final java.lang.String JOB_SCHEDULER_SERVICE = "jobscheduler";







    field public static final java.lang.String JOB_SCHEDULER_SERVICE = "jobscheduler";











    field public static final java.lang.String KEYGUARD_SERVICE = "keyguard";







    field public static final java.lang.String KEYGUARD_SERVICE = "keyguard";











    field public static final java.lang.String LAUNCHER_APPS_SERVICE = "launcherapps";







    field public static final java.lang.String LAUNCHER_APPS_SERVICE = "launcherapps";










@@ -25602,66 +25601,6 @@ package android.net {









    field public static final android.os.Parcelable.Creator<android.net.IpPrefix> CREATOR;







    field public static final android.os.Parcelable.Creator<android.net.IpPrefix> CREATOR;











  }







  }



























  public final class IpSecAlgorithm implements android.os.Parcelable {














    ctor public IpSecAlgorithm(java.lang.String, byte[]);














    ctor public IpSecAlgorithm(java.lang.String, byte[], int);














    method public int describeContents();














    method public byte[] getKey();














    method public java.lang.String getName();














    method public int getTruncationLengthBits();














    method public void writeToParcel(android.os.Parcel, int);














    field public static final java.lang.String AUTH_HMAC_MD5 = "hmac(md5)";














    field public static final java.lang.String AUTH_HMAC_SHA1 = "hmac(sha1)";














    field public static final java.lang.String AUTH_HMAC_SHA256 = "hmac(sha256)";














    field public static final java.lang.String AUTH_HMAC_SHA384 = "hmac(sha384)";














    field public static final java.lang.String AUTH_HMAC_SHA512 = "hmac(sha512)";














    field public static final android.os.Parcelable.Creator<android.net.IpSecAlgorithm> CREATOR;














    field public static final java.lang.String CRYPT_AES_CBC = "cbc(aes)";














  }



























  public final class IpSecManager {














    method public void applyTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform) throws java.io.IOException;














    method public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket(int) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;














    method public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket() throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;














    method public void removeTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform) throws java.io.IOException;














    method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(int, java.net.InetAddress) throws android.net.IpSecManager.ResourceUnavailableException;














    method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(int, java.net.InetAddress, int) throws android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;














    field public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; // 0x0














  }



























  public static final class IpSecManager.ResourceUnavailableException extends android.util.AndroidException {














  }



























  public static final class IpSecManager.SecurityParameterIndex implements java.lang.AutoCloseable {














    method public void close();














    method public int getSpi();














  }



























  public static final class IpSecManager.SpiUnavailableException extends android.util.AndroidException {














    method public int getSpi();














  }



























  public static final class IpSecManager.UdpEncapsulationSocket implements java.lang.AutoCloseable {














    method public void close() throws java.io.IOException;














    method public int getPort();














    method public java.io.FileDescriptor getSocket();














  }



























  public final class IpSecTransform implements java.lang.AutoCloseable {














    method public void close();














    field public static final int DIRECTION_IN = 0; // 0x0














    field public static final int DIRECTION_OUT = 1; // 0x1














  }



























  public static class IpSecTransform.Builder {














    ctor public IpSecTransform.Builder(android.content.Context);














    method public android.net.IpSecTransform buildTransportModeTransform(java.net.InetAddress) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;














    method public android.net.IpSecTransform.Builder setAuthentication(int, android.net.IpSecAlgorithm);














    method public android.net.IpSecTransform.Builder setEncryption(int, android.net.IpSecAlgorithm);














    method public android.net.IpSecTransform.Builder setIpv4Encapsulation(android.net.IpSecManager.UdpEncapsulationSocket, int);














    method public android.net.IpSecTransform.Builder setSpi(int, android.net.IpSecManager.SecurityParameterIndex);














  }



























  public class LinkAddress implements android.os.Parcelable {







  public class LinkAddress implements android.os.Parcelable {











    method public int describeContents();







    method public int describeContents();











    method public java.net.InetAddress getAddress();







    method public java.net.InetAddress getAddress();

























core/java/android/content/Context.java



+1
−3




























Original line number
Original line
Diff line number
Diff line








@@ -2967,9 +2967,6 @@ public abstract class Context {









     *  <dt> {@link #CONNECTIVITY_SERVICE} ("connection")







     *  <dt> {@link #CONNECTIVITY_SERVICE} ("connection")











     *  <dd> A {@link android.net.ConnectivityManager ConnectivityManager} for







     *  <dd> A {@link android.net.ConnectivityManager ConnectivityManager} for











     *  handling management of network connections.







     *  handling management of network connections.











     *  <dt> {@link #IPSEC_SERVICE} ("ipsec")














     *  <dd> A {@link android.net.IpSecManager IpSecManager} for managing IPSec on














     *  sockets and networks.














     *  <dt> {@link #WIFI_SERVICE} ("wifi")







     *  <dt> {@link #WIFI_SERVICE} ("wifi")











     *  <dd> A {@link android.net.wifi.WifiManager WifiManager} for management of Wi-Fi







     *  <dd> A {@link android.net.wifi.WifiManager WifiManager} for management of Wi-Fi











     *  connectivity.  On releases before NYC, it should only be obtained from an application







     *  connectivity.  On releases before NYC, it should only be obtained from an application










@@ -3314,6 +3311,7 @@ public abstract class Context {









     * {@link android.net.IpSecManager} for encrypting Sockets or Networks with







     * {@link android.net.IpSecManager} for encrypting Sockets or Networks with











     * IPSec.







     * IPSec.











     *







     *














     * @hide











     * @see #getSystemService







     * @see #getSystemService











     */







     */











    public static final String IPSEC_SERVICE = "ipsec";







    public static final String IPSEC_SERVICE = "ipsec";

































core/java/android/net/IpSecAlgorithm.java



+2
−0




























Original line number
Original line
Diff line number
Diff line








@@ -24,6 +24,8 @@ import java.lang.annotation.RetentionPolicy;









/**







/**











 * IpSecAlgorithm specifies a single algorithm that can be applied to an IpSec Transform. Refer to







 * IpSecAlgorithm specifies a single algorithm that can be applied to an IpSec Transform. Refer to











 * RFC 4301.







 * RFC 4301.














 *














 * @hide











 */







 */











public final class IpSecAlgorithm implements Parcelable {







public final class IpSecAlgorithm implements Parcelable {