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

Commit e34c3bca authored Feb 24, 2015 by Jim Miller Committed by The Android Automerger Feb 25, 2015

Remove TrustAgent whitelisting API

Due to a bug caught late in the release, this API is broken
and should be removed from API 22 because it's too late for
a fix and there's no workaround.

Bug 19461292

Change-Id: Ib0757a4484b14afe7f83ae9527bb3f5f4834ee62

parent d0f748a7

api/current.txt

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5336,7 +5336,6 @@ package android.app.admin {
	method public boolean getScreenCaptureDisabled(android.content.ComponentName);		method public boolean getScreenCaptureDisabled(android.content.ComponentName);
	method public boolean getStorageEncryption(android.content.ComponentName);		method public boolean getStorageEncryption(android.content.ComponentName);
	method public int getStorageEncryptionStatus();		method public int getStorageEncryptionStatus();
	method public java.util.List<android.os.PersistableBundle> getTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName);
	method public boolean hasCaCertInstalled(android.content.ComponentName, byte[]);		method public boolean hasCaCertInstalled(android.content.ComponentName, byte[]);
	method public boolean hasGrantedPolicy(android.content.ComponentName, int);		method public boolean hasGrantedPolicy(android.content.ComponentName, int);
	method public boolean installCaCert(android.content.ComponentName, byte[]);		method public boolean installCaCert(android.content.ComponentName, byte[]);
	@@ -5385,7 +5384,6 @@ package android.app.admin {
	method public void setScreenCaptureDisabled(android.content.ComponentName, boolean);		method public void setScreenCaptureDisabled(android.content.ComponentName, boolean);
	method public void setSecureSetting(android.content.ComponentName, java.lang.String, java.lang.String);		method public void setSecureSetting(android.content.ComponentName, java.lang.String, java.lang.String);
	method public int setStorageEncryption(android.content.ComponentName, boolean);		method public int setStorageEncryption(android.content.ComponentName, boolean);
	method public void setTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName, android.os.PersistableBundle);
	method public void setUninstallBlocked(android.content.ComponentName, java.lang.String, boolean);		method public void setUninstallBlocked(android.content.ComponentName, java.lang.String, boolean);
	method public boolean switchUser(android.content.ComponentName, android.os.UserHandle);		method public boolean switchUser(android.content.ComponentName, android.os.UserHandle);
	method public void uninstallAllUserCaCerts(android.content.ComponentName);		method public void uninstallAllUserCaCerts(android.content.ComponentName);

api/system-current.txt

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5469,7 +5469,6 @@ package android.app.admin {
	method public boolean getScreenCaptureDisabled(android.content.ComponentName);		method public boolean getScreenCaptureDisabled(android.content.ComponentName);
	method public boolean getStorageEncryption(android.content.ComponentName);		method public boolean getStorageEncryption(android.content.ComponentName);
	method public int getStorageEncryptionStatus();		method public int getStorageEncryptionStatus();
	method public java.util.List<android.os.PersistableBundle> getTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName);
	method public boolean hasCaCertInstalled(android.content.ComponentName, byte[]);		method public boolean hasCaCertInstalled(android.content.ComponentName, byte[]);
	method public boolean hasGrantedPolicy(android.content.ComponentName, int);		method public boolean hasGrantedPolicy(android.content.ComponentName, int);
	method public boolean installCaCert(android.content.ComponentName, byte[]);		method public boolean installCaCert(android.content.ComponentName, byte[]);
	@@ -5519,7 +5518,6 @@ package android.app.admin {
	method public void setScreenCaptureDisabled(android.content.ComponentName, boolean);		method public void setScreenCaptureDisabled(android.content.ComponentName, boolean);
	method public void setSecureSetting(android.content.ComponentName, java.lang.String, java.lang.String);		method public void setSecureSetting(android.content.ComponentName, java.lang.String, java.lang.String);
	method public int setStorageEncryption(android.content.ComponentName, boolean);		method public int setStorageEncryption(android.content.ComponentName, boolean);
	method public void setTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName, android.os.PersistableBundle);
	method public void setUninstallBlocked(android.content.ComponentName, java.lang.String, boolean);		method public void setUninstallBlocked(android.content.ComponentName, java.lang.String, boolean);
	method public boolean switchUser(android.content.ComponentName, android.os.UserHandle);		method public boolean switchUser(android.content.ComponentName, android.os.UserHandle);
	method public void uninstallAllUserCaCerts(android.content.ComponentName);		method public void uninstallAllUserCaCerts(android.content.ComponentName);

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2698,6 +2698,7 @@ public class DevicePolicyManager {
	* <p>If {@link #KEYGUARD_DISABLE_TRUST_AGENTS} is set and options is not null for all admins,		* <p>If {@link #KEYGUARD_DISABLE_TRUST_AGENTS} is set and options is not null for all admins,
	* then it's up to the TrustAgent itself to aggregate the values from all device admins.		* then it's up to the TrustAgent itself to aggregate the values from all device admins.
	* <p>Consult documentation for the specific TrustAgent to determine legal options parameters.		* <p>Consult documentation for the specific TrustAgent to determine legal options parameters.
			* @hide
	*/		*/
	public void setTrustAgentConfiguration(ComponentName admin, ComponentName target,		public void setTrustAgentConfiguration(ComponentName admin, ComponentName target,
	PersistableBundle configuration) {		PersistableBundle configuration) {
	@@ -2724,6 +2725,7 @@ public class DevicePolicyManager {
	* for this {@param agent} or calls it with a null configuration, null is returned.		* for this {@param agent} or calls it with a null configuration, null is returned.
	* @param agent Which component to get enabled features for.		* @param agent Which component to get enabled features for.
	* @return configuration for the given trust agent.		* @return configuration for the given trust agent.
			* @hide
	*/		*/
	public List<PersistableBundle> getTrustAgentConfiguration(ComponentName admin,		public List<PersistableBundle> getTrustAgentConfiguration(ComponentName admin,
	ComponentName agent) {		ComponentName agent) {