Device Policy Manager changes to enable Global Proxy.
Change-Id: I8489df7d28e4c5312e10d5cecc8e2a182413a034
diff --git a/core/java/android/app/admin/DeviceAdminInfo.java b/core/java/android/app/admin/DeviceAdminInfo.java
index 0bcd65c..e09cda2 100644
--- a/core/java/android/app/admin/DeviceAdminInfo.java
+++ b/core/java/android/app/admin/DeviceAdminInfo.java
@@ -103,6 +103,16 @@
*/
public static final int USES_POLICY_WIPE_DATA = 4;
+ /**
+ * A type of policy that this device admin can use: able to specify the
+ * device Global Proxy, via {@link DevicePolicyManager#setGlobalProxy}.
+ *
+ * <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;
+
/** @hide */
public static class PolicyInfo {
public final int ident;
@@ -138,6 +148,9 @@
sPoliciesDisplayOrder.add(new PolicyInfo(USES_POLICY_FORCE_LOCK, "force-lock",
com.android.internal.R.string.policylab_forceLock,
com.android.internal.R.string.policydesc_forceLock));
+ sPoliciesDisplayOrder.add(new PolicyInfo(USES_POLICY_SETS_GLOBAL_PROXY, "set-global-proxy",
+ com.android.internal.R.string.policylab_setGlobalProxy,
+ com.android.internal.R.string.policydesc_setGlobalProxy));
for (int i=0; i<sPoliciesDisplayOrder.size(); i++) {
PolicyInfo pi = sPoliciesDisplayOrder.get(i);
@@ -328,7 +341,7 @@
* 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_WIPE_DATA}, {@link #USES_POLICY_SETS_GLOBAL_PROXY}.
*/
public boolean usesPolicy(int policyIdent) {
return (mUsesPolicies & (1<<policyIdent)) != 0;
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 3066f5c..1255e63 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -32,6 +32,8 @@
import android.util.Log;
import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
import java.util.List;
/**
@@ -915,6 +917,93 @@
}
/**
+ * Called by an application that is administering the device to set the
+ * global proxy and exclusion list.
+ * <p>
+ * The calling device admin must have requested
+ * {@link DeviceAdminInfo#USES_POLICY_SETS_GLOBAL_PROXY} to be able to call
+ * this method; if it has not, a security exception will be thrown.
+ * Only the first device admin can set the proxy. If a second admin attempts
+ * to set the proxy, the {@link ComponentName} of the admin originally setting the
+ * proxy will be returned. If successful in setting the proxy, null will
+ * be returned.
+ * The method can be called repeatedly by the device admin alrady setting the
+ * proxy to update the proxy and exclusion list.
+ *
+ * @param admin Which {@link DeviceAdminReceiver} this request is associated
+ * with.
+ * @param proxySpec the global proxy desired. Must be an HTTP Proxy.
+ * Pass Proxy.NO_PROXY to reset the proxy.
+ * @param exclusionList a list of domains to be excluded from the global proxy.
+ * @param proxyAdmins an empty, mutable list that will contain any proxy admins
+ * that define a global proxy.
+ * @return returns null if the proxy was successfully set, or a {@link ComponentName}
+ * of the device admin that sets thew proxy otherwise.
+ */
+ public ComponentName setGlobalProxy(ComponentName admin, Proxy proxySpec,
+ List<String> exclusionList ) {
+ if (proxySpec == null) {
+ throw new NullPointerException();
+ }
+ if (mService != null) {
+ try {
+ String hostSpec;
+ String exclSpec;
+ if (proxySpec.equals(Proxy.NO_PROXY)) {
+ hostSpec = null;
+ exclSpec = null;
+ } else {
+ if (!proxySpec.type().equals(Proxy.Type.HTTP)) {
+ throw new IllegalArgumentException();
+ }
+ InetSocketAddress sa = (InetSocketAddress)proxySpec.address();
+ String hostName = sa.getHostName();
+ int port = sa.getPort();
+ StringBuilder hostBuilder = new StringBuilder();
+ hostSpec = hostBuilder.append(hostName)
+ .append(":").append(Integer.toString(port)).toString();
+ if (exclusionList == null) {
+ exclSpec = "";
+ } else {
+ StringBuilder listBuilder = new StringBuilder();
+ boolean firstDomain = true;
+ for (String exclDomain : exclusionList) {
+ if (!firstDomain) {
+ listBuilder = listBuilder.append(",");
+ } else {
+ firstDomain = false;
+ }
+ listBuilder = listBuilder.append(exclDomain.trim());
+ }
+ exclSpec = listBuilder.toString();
+ }
+ android.net.Proxy.validate(hostName, Integer.toString(port), exclSpec);
+ }
+ return mService.setGlobalProxy(admin, hostSpec, exclSpec);
+ } catch (RemoteException e) {
+ Log.w(TAG, "Failed talking with device policy service", e);
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 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.
+ */
+ public ComponentName getGlobalProxyAdmin() {
+ if (mService != null) {
+ try {
+ return mService.getGlobalProxyAdmin();
+ } catch (RemoteException e) {
+ Log.w(TAG, "Failed talking with device policy service", e);
+ }
+ }
+ return null;
+ }
+
+ /**
* @hide
*/
public void setActiveAdmin(ComponentName policyReceiver) {
@@ -1007,4 +1096,5 @@
}
}
}
+
}
diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl
index 3ada95c..3fcd6fc 100644
--- a/core/java/android/app/admin/IDevicePolicyManager.aidl
+++ b/core/java/android/app/admin/IDevicePolicyManager.aidl
@@ -66,6 +66,9 @@
void lockNow();
void wipeData(int flags);
+
+ ComponentName setGlobalProxy(in ComponentName admin, String proxySpec, String exclusionList);
+ ComponentName getGlobalProxyAdmin();
void setActiveAdmin(in ComponentName policyReceiver);
boolean isAdminActive(in ComponentName policyReceiver);
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 0304b1d..32a1f0d 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -1252,6 +1252,11 @@
<!-- Description of policy access to wipe the user's data -->
<string name="policydesc_wipeData">Perform a factory reset, deleting
all of your data without any confirmation.</string>
+ <string name="policylab_setGlobalProxy">Set the device global proxy</string>
+ <!-- Description of policy access to wipe the user's data -->
+ <string name="policydesc_setGlobalProxy">Set the device global proxy
+ to be used while policy is enabled. Only the first device admin
+ sets the effective global proxy.</string>
<!-- The order of these is important, don't reorder without changing Contacts.java --> <skip />
<!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->