PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev

Browse Source 
am: 262aacd353

Change-Id: I66fbaf0f98dd22679068f1fdefce0e7dbfc81939
This commit is contained in:
Bartosz Fabianowski
2017-07-25 10:18:41 +00:00
committed by android-build-merger
parent 7edaa60315 262aacd353
commit 96a14ff07e
4 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java
View File

@@ -45,6 +45,13 @@ public interface DevicePolicyManagerWrapper {
*/
int getMaximumFailedPasswordsForWipe(@Nullable ComponentName admin, int userHandle);
/**
* Calls {@code DevicePolicyManager.getDeviceOwnerComponentOnCallingUser()}.
*
* @see android.app.admin.DevicePolicyManager#getDeviceOwnerComponentOnCallingUser
*/
ComponentName getDeviceOwnerComponentOnCallingUser();
/**
* Calls {@code DevicePolicyManager.getDeviceOwnerComponentOnAnyUser()}.
*

5
src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java
View File

@@ -42,6 +42,11 @@ public class DevicePolicyManagerWrapperImpl implements DevicePolicyManagerWrappe
return mDpm.getMaximumFailedPasswordsForWipe(admin, userHandle);
}
@Override
public ComponentName getDeviceOwnerComponentOnCallingUser() {
return mDpm.getDeviceOwnerComponentOnCallingUser();
}
@Override
public ComponentName getDeviceOwnerComponentOnAnyUser() {
return mDpm.getDeviceOwnerComponentOnAnyUser();

9
src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
View File

@@ -158,11 +158,14 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe
@Override
public int getMaximumFailedPasswordsBeforeWipeInCurrentUser() {
final ComponentName profileOwner = mDpm.getProfileOwnerAsUser(MY_USER_ID);
if (profileOwner == null) {
ComponentName owner = mDpm.getDeviceOwnerComponentOnCallingUser();
if (owner == null) {
owner = mDpm.getProfileOwnerAsUser(MY_USER_ID);
}
if (owner == null) {
return 0;
}
return mDpm.getMaximumFailedPasswordsForWipe(profileOwner, MY_USER_ID);
return mDpm.getMaximumFailedPasswordsForWipe(owner, MY_USER_ID);
}
@Override

5
tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
View File

@@ -231,6 +231,7 @@ public final class EnterprisePrivacyFeatureProviderImplTest {
@Test
public void testGetMaximumFailedPasswordsForWipeInCurrentUser() {
when(mDevicePolicyManager.getDeviceOwnerComponentOnCallingUser()).thenReturn(null);
when(mDevicePolicyManager.getProfileOwnerAsUser(MY_USER_ID)).thenReturn(null);
when(mDevicePolicyManager.getMaximumFailedPasswordsForWipe(OWNER, MY_USER_ID))
.thenReturn(10);
@@ -238,6 +239,10 @@ public final class EnterprisePrivacyFeatureProviderImplTest {
when(mDevicePolicyManager.getProfileOwnerAsUser(MY_USER_ID)).thenReturn(OWNER);
assertThat(mProvider.getMaximumFailedPasswordsBeforeWipeInCurrentUser()).isEqualTo(10);
when(mDevicePolicyManager.getDeviceOwnerComponentOnCallingUser()).thenReturn(OWNER);
when(mDevicePolicyManager.getProfileOwnerAsUser(MY_USER_ID)).thenReturn(null);
assertThat(mProvider.getMaximumFailedPasswordsBeforeWipeInCurrentUser()).isEqualTo(10);
}
@Test