diff options
| author | Andy Stadler <stadler@google.com> | 2011-02-16 10:53:33 -0800 |
|---|---|---|
| committer | Andy Stadler <stadler@google.com> | 2011-02-16 10:53:33 -0800 |
| commit | d26727273d16745ceddc2203121d29c3a9e7733c (patch) | |
| tree | ec40a47275a82ad3e8c0acce90048111dd2a9946 /api | |
| parent | f79bbc305bdb0c8aa46dd7e621e229b8fd447ab9 (diff) | |
| download | frameworks_base-d26727273d16745ceddc2203121d29c3a9e7733c.zip frameworks_base-d26727273d16745ceddc2203121d29c3a9e7733c.tar.gz frameworks_base-d26727273d16745ceddc2203121d29c3a9e7733c.tar.bz2 | |
@hide DPM global proxy settings
They don't work as advertised, so remove from SDK.
Bug: 3460938
Change-Id: I87f80ebf38b228a4085630f1c2526c1d86b93dd7
Diffstat (limited to 'api')
| -rw-r--r-- | api/11.xml | 39 | ||||
| -rw-r--r-- | api/current.xml | 39 |
2 files changed, 0 insertions, 78 deletions
@@ -37266,17 +37266,6 @@ visibility="public" > </field> -<field name="USES_POLICY_SETS_GLOBAL_PROXY" - type="int" - transient="false" - volatile="false" - value="5" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> <field name="USES_POLICY_WATCH_LOGIN" type="int" transient="false" @@ -37592,17 +37581,6 @@ visibility="public" > </method> -<method name="getGlobalProxyAdmin" - return="android.content.ComponentName" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> <method name="getMaximumFailedPasswordsForWipe" return="int" abstract="false" @@ -37887,23 +37865,6 @@ <parameter name="flags" type="int"> </parameter> </method> -<method name="setGlobalProxy" - return="android.content.ComponentName" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="admin" type="android.content.ComponentName"> -</parameter> -<parameter name="proxySpec" type="java.net.Proxy"> -</parameter> -<parameter name="exclusionList" type="java.util.List<java.lang.String>"> -</parameter> -</method> <method name="setMaximumFailedPasswordsForWipe" return="void" abstract="false" diff --git a/api/current.xml b/api/current.xml index 4a40c36..ed4a2e0 100644 --- a/api/current.xml +++ b/api/current.xml @@ -37266,17 +37266,6 @@ visibility="public" > </field> -<field name="USES_POLICY_SETS_GLOBAL_PROXY" - type="int" - transient="false" - volatile="false" - value="5" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> <field name="USES_POLICY_WATCH_LOGIN" type="int" transient="false" @@ -37592,17 +37581,6 @@ visibility="public" > </method> -<method name="getGlobalProxyAdmin" - return="android.content.ComponentName" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> <method name="getMaximumFailedPasswordsForWipe" return="int" abstract="false" @@ -37887,23 +37865,6 @@ <parameter name="flags" type="int"> </parameter> </method> -<method name="setGlobalProxy" - return="android.content.ComponentName" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="admin" type="android.content.ComponentName"> -</parameter> -<parameter name="proxySpec" type="java.net.Proxy"> -</parameter> -<parameter name="exclusionList" type="java.util.List<java.lang.String>"> -</parameter> -</method> <method name="setMaximumFailedPasswordsForWipe" return="void" abstract="false" |