diff options
| author | Andy Stadler <stadler@google.com> | 2011-02-16 12:22:57 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-16 12:22:57 -0800 |
| commit | b84133740a358ff41f7e50172403f233e1603e68 (patch) | |
| tree | be8627bf077eff1ce49c461e79d07037c5ccd453 /api | |
| parent | d5444802b7be29d385ad8a12d06b966aa940805f (diff) | |
| parent | 04ddff6905a72d0d39d791eaba33546fb66b15a6 (diff) | |
| download | frameworks_base-b84133740a358ff41f7e50172403f233e1603e68.zip frameworks_base-b84133740a358ff41f7e50172403f233e1603e68.tar.gz frameworks_base-b84133740a358ff41f7e50172403f233e1603e68.tar.bz2 | |
am 04ddff69: am b1835085: Merge "@hide DPM global proxy settings" into honeycomb
* commit '04ddff6905a72d0d39d791eaba33546fb66b15a6':
@hide DPM global proxy settings
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 7806c24..b136915 100644 --- a/api/current.xml +++ b/api/current.xml @@ -37376,17 +37376,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" @@ -37702,17 +37691,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" @@ -37997,23 +37975,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" |