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

Commit d2672727 authored by Andy Stadler's avatar Andy Stadler
Browse files

@hide DPM global proxy settings 

They don't work as advertised, so remove from SDK.

Bug: 3460938

Change-Id: I87f80ebf38b228a4085630f1c2526c1d86b93dd7
parent f79bbc30

api/11.xml

+0 −39
Original line number Original line Diff line number Diff line
@@ -37266,17 +37266,6 @@ 
 visibility="public"

 visibility="public"

>

>

</field>

</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"

<field name="USES_POLICY_WATCH_LOGIN"

 type="int"

 type="int"

 transient="false"

 transient="false"
@@ -37592,17 +37581,6 @@ 
 visibility="public"

 visibility="public"

>

>

</method>

</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"

<method name="getMaximumFailedPasswordsForWipe"

 return="int"

 return="int"

 abstract="false"

 abstract="false"
@@ -37887,23 +37865,6 @@ 
<parameter name="flags" type="int">

<parameter name="flags" type="int">

</parameter>

</parameter>

</method>

</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"

<method name="setMaximumFailedPasswordsForWipe"

 return="void"

 return="void"

 abstract="false"

 abstract="false"

api/current.xml

+0 −39
Original line number Original line Diff line number Diff line
@@ -37266,17 +37266,6 @@ 
 visibility="public"

 visibility="public"

>

>

</field>

</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"

<field name="USES_POLICY_WATCH_LOGIN"

 type="int"

 type="int"

 transient="false"

 transient="false"
@@ -37592,17 +37581,6 @@ 
 visibility="public"

 visibility="public"

>

>

</method>

</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"

<method name="getMaximumFailedPasswordsForWipe"

 return="int"

 return="int"

 abstract="false"

 abstract="false"
@@ -37887,23 +37865,6 @@ 
<parameter name="flags" type="int">

<parameter name="flags" type="int">

</parameter>

</parameter>

</method>

</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"

<method name="setMaximumFailedPasswordsForWipe"

 return="void"

 return="void"

 abstract="false"

 abstract="false"

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -109,6 +109,7 @@ public final class DeviceAdminInfo implements Parcelable { 
     *

     *

     * <p>To control this policy, the device admin must have a "set-global-proxy"

     * <p>To control this policy, the device admin must have a "set-global-proxy"

     * tag in the "uses-policies" section of its meta-data.

     * tag in the "uses-policies" section of its meta-data.

     * @hide

     */

     */

    public static final int USES_POLICY_SETS_GLOBAL_PROXY = 5;

    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:

     * the given policy control.  The possible policy identifier inputs are:

     * {@link #USES_POLICY_LIMIT_PASSWORD}, {@link #USES_POLICY_WATCH_LOGIN},

     * {@link #USES_POLICY_LIMIT_PASSWORD}, {@link #USES_POLICY_WATCH_LOGIN},

     * {@link #USES_POLICY_RESET_PASSWORD}, {@link #USES_POLICY_FORCE_LOCK},

     * {@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}.

     * {@link #USES_POLICY_EXPIRE_PASSWORD}, {@link #USES_ENCRYPTED_STORAGE}.

     */

     */

    public boolean usesPolicy(int policyIdent) {

    public boolean usesPolicy(int policyIdent) {

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -1028,6 +1028,7 @@ public class DevicePolicyManager { 
     * @param exclusionList a list of domains to be excluded from the global proxy.

     * @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}

     * @return returns null if the proxy was successfully set, or a {@link ComponentName}

     *            of the device admin that sets thew proxy otherwise.

     *            of the device admin that sets thew proxy otherwise.

     * @hide

     */

     */

    public ComponentName setGlobalProxy(ComponentName admin, Proxy proxySpec,

    public ComponentName setGlobalProxy(ComponentName admin, Proxy proxySpec,

            List<String> exclusionList ) {

            List<String> exclusionList ) {
@@ -1080,6 +1081,7 @@ public class DevicePolicyManager { 
     * Returns the component name setting the global proxy.

     * Returns the component name setting the global proxy.

     * @return ComponentName object of the device admin that set the global proxy, or

     * @return ComponentName object of the device admin that set the global proxy, or

     *            null if no admin has set the proxy.

     *            null if no admin has set the proxy.

     * @hide

     */

     */

    public ComponentName getGlobalProxyAdmin() {

    public ComponentName getGlobalProxyAdmin() {

        if (mService != null) {

        if (mService != null) {