Merge "@hide DPM global proxy settings" into honeycomb

api/11.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&lt;java.lang.String&gt;">
-</parameter>
-</method>
 <method name="setMaximumFailedPasswordsForWipe"
  return="void"
  abstract="false"

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&lt;java.lang.String&gt;">
-</parameter>
-</method>
 <method name="setMaximumFailedPasswordsForWipe"
  return="void"
  abstract="false"

core/java/android/app/admin/DeviceAdminInfo.java

@@ -109,6 +109,7 @@ public final class DeviceAdminInfo implements Parcelable {
      *
      * <p>To control this policy, the device admin must have a "set-global-proxy"
      * tag in the "uses-policies" section of its meta-data.
+     * @hide
      */
     public static final int USES_POLICY_SETS_GLOBAL_PROXY = 5;
 
@@ -363,7 +364,7 @@ public final class DeviceAdminInfo implements Parcelable {
      * the given policy control.  The possible policy identifier inputs are:
      * {@link #USES_POLICY_LIMIT_PASSWORD}, {@link #USES_POLICY_WATCH_LOGIN},
      * {@link #USES_POLICY_RESET_PASSWORD}, {@link #USES_POLICY_FORCE_LOCK},
-     * {@link #USES_POLICY_WIPE_DATA}, {@link #USES_POLICY_SETS_GLOBAL_PROXY},
+     * {@link #USES_POLICY_WIPE_DATA},
      * {@link #USES_POLICY_EXPIRE_PASSWORD}, {@link #USES_ENCRYPTED_STORAGE}.
      */
     public boolean usesPolicy(int policyIdent) {

core/java/android/app/admin/DevicePolicyManager.java

@@ -1028,6 +1028,7 @@ public class DevicePolicyManager {
      * @param exclusionList a list of domains to be excluded from the global proxy.
      * @return returns null if the proxy was successfully set, or a {@link ComponentName}
      *            of the device admin that sets thew proxy otherwise.
+     * @hide
      */
     public ComponentName setGlobalProxy(ComponentName admin, Proxy proxySpec,
             List<String> exclusionList ) {
@@ -1080,6 +1081,7 @@ public class DevicePolicyManager {
      * Returns the component name setting the global proxy.
      * @return ComponentName object of the device admin that set the global proxy, or
      *            null if no admin has set the proxy.
+     * @hide
      */
     public ComponentName getGlobalProxyAdmin() {
         if (mService != null) {