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

Commit 0d250200 authored by Michal Karpinski's avatar Michal Karpinski Committed by Android (Google) Code Review
Browse files

Merge "Unhiding strong auth timeout API"

parents 058b69e5 a20d8bb2

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -6035,6 +6035,7 @@ package android.app.admin { 
    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> getPermittedInputMethods(android.content.ComponentName);

    method public long getRequiredStrongAuthTimeout(android.content.ComponentName);

    method public boolean getScreenCaptureDisabled(android.content.ComponentName);

    method public java.lang.CharSequence getShortSupportMessage(android.content.ComponentName);

    method public boolean getStorageEncryption(android.content.ComponentName);
@@ -6111,6 +6112,7 @@ package android.app.admin { 
    method public void setProfileEnabled(android.content.ComponentName);

    method public void setProfileName(android.content.ComponentName, java.lang.String);

    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 setScreenCaptureDisabled(android.content.ComponentName, boolean);

    method public void setSecureSetting(android.content.ComponentName, java.lang.String, java.lang.String);

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -6215,6 +6215,7 @@ package android.app.admin { 
    method public java.util.List<java.lang.String> getPermittedInputMethodsForCurrentUser();

    method public android.content.ComponentName getProfileOwner() 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 java.lang.CharSequence getShortSupportMessage(android.content.ComponentName);

    method public boolean getStorageEncryption(android.content.ComponentName);
@@ -6294,6 +6295,7 @@ package android.app.admin { 
    method public void setProfileEnabled(android.content.ComponentName);

    method public void setProfileName(android.content.ComponentName, java.lang.String);

    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 setScreenCaptureDisabled(android.content.ComponentName, boolean);

    method public void setSecureSetting(android.content.ComponentName, java.lang.String, java.lang.String);

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -6051,6 +6051,7 @@ package android.app.admin { 
    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> getPermittedInputMethods(android.content.ComponentName);

    method public long getRequiredStrongAuthTimeout(android.content.ComponentName);

    method public boolean getScreenCaptureDisabled(android.content.ComponentName);

    method public java.lang.CharSequence getShortSupportMessage(android.content.ComponentName);

    method public boolean getStorageEncryption(android.content.ComponentName);
@@ -6127,6 +6128,7 @@ package android.app.admin { 
    method public void setProfileEnabled(android.content.ComponentName);

    method public void setProfileName(android.content.ComponentName, java.lang.String);

    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 setScreenCaptureDisabled(android.content.ComponentName, boolean);

    method public void setSecureSetting(android.content.ComponentName, java.lang.String, java.lang.String);

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

+2 −4
Original line number Diff line number Diff line
@@ -2372,8 +2372,6 @@ public class DevicePolicyManager { 
     *         {@link #KEYGUARD_DISABLE_TRUST_AGENTS}.

     *

     * @throws SecurityException if {@code admin} is not a device or profile owner.

     *

     * @hide

     */

    public void setRequiredStrongAuthTimeout(@NonNull ComponentName admin,

            long timeoutMs) {
@@ -2398,8 +2396,6 @@ public class DevicePolicyManager { 
     * @param admin The name of the admin component to check, or {@code null} to aggregate

     *         accross all participating admins.

     * @return The timeout or 0 if not configured for the provided admin.

     *

     * @hide

     */

    public long getRequiredStrongAuthTimeout(@Nullable ComponentName admin) {

        return getRequiredStrongAuthTimeout(admin, myUserId());
@@ -6159,6 +6155,8 @@ public class DevicePolicyManager { 
     * <li>{@link #setKeyguardDisabledFeatures}</li>

     * <li>{@link #getTrustAgentConfiguration}</li>

     * <li>{@link #setTrustAgentConfiguration}</li>

     * <li>{@link #getRequiredStrongAuthTimeout}</li>

     * <li>{@link #setRequiredStrongAuthTimeout}</li>

     * </ul>

     *

     * @return a new instance of {@link DevicePolicyManager} that acts on the parent profile.