Unhiding strong auth timeout API (a20d8bb2) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

api/system-current.txt

+2 −0

api/test-current.txt

+2 −0

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

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2372,8 +2372,6 @@ public class DevicePolicyManager {
	* {@link #KEYGUARD_DISABLE_TRUST_AGENTS}.		* {@link #KEYGUARD_DISABLE_TRUST_AGENTS}.
	*		*
	* @throws SecurityException if {@code admin} is not a device or profile owner.		* @throws SecurityException if {@code admin} is not a device or profile owner.
	*
	* @hide
	*/		*/
	public void setRequiredStrongAuthTimeout(@NonNull ComponentName admin,		public void setRequiredStrongAuthTimeout(@NonNull ComponentName admin,
	long timeoutMs) {		long timeoutMs) {
	@@ -2398,8 +2396,6 @@ public class DevicePolicyManager {
	* @param admin The name of the admin component to check, or {@code null} to aggregate		* @param admin The name of the admin component to check, or {@code null} to aggregate
	* accross all participating admins.		* accross all participating admins.
	* @return The timeout or 0 if not configured for the provided admin.		* @return The timeout or 0 if not configured for the provided admin.
	*
	* @hide
	*/		*/
	public long getRequiredStrongAuthTimeout(@Nullable ComponentName admin) {		public long getRequiredStrongAuthTimeout(@Nullable ComponentName admin) {
	return getRequiredStrongAuthTimeout(admin, myUserId());		return getRequiredStrongAuthTimeout(admin, myUserId());
	@@ -6159,6 +6155,8 @@ public class DevicePolicyManager {
	* <li>{@link #setKeyguardDisabledFeatures}</li>		* <li>{@link #setKeyguardDisabledFeatures}</li>
	* <li>{@link #getTrustAgentConfiguration}</li>		* <li>{@link #getTrustAgentConfiguration}</li>
	* <li>{@link #setTrustAgentConfiguration}</li>		* <li>{@link #setTrustAgentConfiguration}</li>
			* <li>{@link #getRequiredStrongAuthTimeout}</li>
			* <li>{@link #setRequiredStrongAuthTimeout}</li>
	* </ul>		* </ul>
	*		*
	* @return a new instance of {@link DevicePolicyManager} that acts on the parent profile.		* @return a new instance of {@link DevicePolicyManager} that acts on the parent profile.

Original line number	Original line	Diff line number	Diff line
	@@ -6033,6 +6033,7 @@ package android.app.admin {
	method public int getPermissionPolicy(android.content.ComponentName);		method public int getPermissionPolicy(android.content.ComponentName);
	method public java.util.List<java.lang.String> getPermittedAccessibilityServices(android.content.ComponentName);		method public java.util.List<java.lang.String> getPermittedAccessibilityServices(android.content.ComponentName);
	method public java.util.List<java.lang.String> getPermittedInputMethods(android.content.ComponentName);		method public java.util.List<java.lang.String> getPermittedInputMethods(android.content.ComponentName);
			method public long getRequiredStrongAuthTimeout(android.content.ComponentName);
	method public boolean getScreenCaptureDisabled(android.content.ComponentName);		method public boolean getScreenCaptureDisabled(android.content.ComponentName);
	method public java.lang.CharSequence getShortSupportMessage(android.content.ComponentName);		method public java.lang.CharSequence getShortSupportMessage(android.content.ComponentName);
	method public boolean getStorageEncryption(android.content.ComponentName);		method public boolean getStorageEncryption(android.content.ComponentName);
	@@ -6109,6 +6110,7 @@ package android.app.admin {
	method public void setProfileEnabled(android.content.ComponentName);		method public void setProfileEnabled(android.content.ComponentName);
	method public void setProfileName(android.content.ComponentName, java.lang.String);		method public void setProfileName(android.content.ComponentName, java.lang.String);
	method public void setRecommendedGlobalProxy(android.content.ComponentName, android.net.ProxyInfo);		method public void setRecommendedGlobalProxy(android.content.ComponentName, android.net.ProxyInfo);
			method public void setRequiredStrongAuthTimeout(android.content.ComponentName, long);
	method public void setRestrictionsProvider(android.content.ComponentName, android.content.ComponentName);		method public void setRestrictionsProvider(android.content.ComponentName, android.content.ComponentName);
	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);

Original line number	Original line	Diff line number	Diff line
	@@ -6213,6 +6213,7 @@ package android.app.admin {
	method public java.util.List<java.lang.String> getPermittedInputMethodsForCurrentUser();		method public java.util.List<java.lang.String> getPermittedInputMethodsForCurrentUser();
	method public android.content.ComponentName getProfileOwner() throws java.lang.IllegalArgumentException;		method public android.content.ComponentName getProfileOwner() throws java.lang.IllegalArgumentException;
	method public java.lang.String getProfileOwnerNameAsUser(int) throws java.lang.IllegalArgumentException;		method public java.lang.String getProfileOwnerNameAsUser(int) throws java.lang.IllegalArgumentException;
			method public long getRequiredStrongAuthTimeout(android.content.ComponentName);
	method public boolean getScreenCaptureDisabled(android.content.ComponentName);		method public boolean getScreenCaptureDisabled(android.content.ComponentName);
	method public java.lang.CharSequence getShortSupportMessage(android.content.ComponentName);		method public java.lang.CharSequence getShortSupportMessage(android.content.ComponentName);
	method public boolean getStorageEncryption(android.content.ComponentName);		method public boolean getStorageEncryption(android.content.ComponentName);
	@@ -6292,6 +6293,7 @@ package android.app.admin {
	method public void setProfileEnabled(android.content.ComponentName);		method public void setProfileEnabled(android.content.ComponentName);
	method public void setProfileName(android.content.ComponentName, java.lang.String);		method public void setProfileName(android.content.ComponentName, java.lang.String);
	method public void setRecommendedGlobalProxy(android.content.ComponentName, android.net.ProxyInfo);		method public void setRecommendedGlobalProxy(android.content.ComponentName, android.net.ProxyInfo);
			method public void setRequiredStrongAuthTimeout(android.content.ComponentName, long);
	method public void setRestrictionsProvider(android.content.ComponentName, android.content.ComponentName);		method public void setRestrictionsProvider(android.content.ComponentName, android.content.ComponentName);
	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);

Original line number	Original line	Diff line number	Diff line
	@@ -6049,6 +6049,7 @@ package android.app.admin {
	method public int getPermissionPolicy(android.content.ComponentName);		method public int getPermissionPolicy(android.content.ComponentName);
	method public java.util.List<java.lang.String> getPermittedAccessibilityServices(android.content.ComponentName);		method public java.util.List<java.lang.String> getPermittedAccessibilityServices(android.content.ComponentName);
	method public java.util.List<java.lang.String> getPermittedInputMethods(android.content.ComponentName);		method public java.util.List<java.lang.String> getPermittedInputMethods(android.content.ComponentName);
			method public long getRequiredStrongAuthTimeout(android.content.ComponentName);
	method public boolean getScreenCaptureDisabled(android.content.ComponentName);		method public boolean getScreenCaptureDisabled(android.content.ComponentName);
	method public java.lang.CharSequence getShortSupportMessage(android.content.ComponentName);		method public java.lang.CharSequence getShortSupportMessage(android.content.ComponentName);
	method public boolean getStorageEncryption(android.content.ComponentName);		method public boolean getStorageEncryption(android.content.ComponentName);
	@@ -6125,6 +6126,7 @@ package android.app.admin {
	method public void setProfileEnabled(android.content.ComponentName);		method public void setProfileEnabled(android.content.ComponentName);
	method public void setProfileName(android.content.ComponentName, java.lang.String);		method public void setProfileName(android.content.ComponentName, java.lang.String);
	method public void setRecommendedGlobalProxy(android.content.ComponentName, android.net.ProxyInfo);		method public void setRecommendedGlobalProxy(android.content.ComponentName, android.net.ProxyInfo);
			method public void setRequiredStrongAuthTimeout(android.content.ComponentName, long);
	method public void setRestrictionsProvider(android.content.ComponentName, android.content.ComponentName);		method public void setRestrictionsProvider(android.content.ComponentName, android.content.ComponentName);
	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);