Fix LockSettingsServiceTest

* Mock out registerReceiverAsUser() to avoid SecurityException
* Mock out setKeystorePassword() to not call into the real keystore

Bug: 170661840
Test: atest com.android.server.locksettings
Change-Id: I97c33f3b21ac16d2bb92e1658c222e4d0fd1970e
This commit is contained in:
Rubin Xu
2021-04-15 22:08:53 +01:00
parent 3fbec7cf77
commit 074a8b7012
3 changed files with 20 additions and 2 deletions

View File

@@ -1259,7 +1259,8 @@ public class LockSettingsService extends ILockSettings.Stub {
return getCredentialTypeInternal(userId) != CREDENTIAL_TYPE_NONE;
}
private void setKeystorePassword(byte[] password, int userHandle) {
@VisibleForTesting /** Note: this method is overridden in unit tests */
void setKeystorePassword(byte[] password, int userHandle) {
AndroidKeyStoreMaintenance.onUserPasswordChanged(userHandle, password);
}

View File

@@ -208,4 +208,9 @@ public class LockSettingsServiceTestable extends LockSettingsService {
parcel.recycle();
}
}
}
@Override
void setKeystorePassword(byte[] password, int userHandle) {
}
}

View File

@@ -20,11 +20,16 @@ import android.app.KeyguardManager;
import android.app.NotificationManager;
import android.app.admin.DevicePolicyManager;
import android.app.trust.TrustManager;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.ContextWrapper;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.hardware.face.FaceManager;
import android.hardware.fingerprint.FingerprintManager;
import android.os.Handler;
import android.os.UserHandle;
import android.os.UserManager;
import android.os.storage.StorageManager;
@@ -94,4 +99,11 @@ public class MockLockSettingsContext extends ContextWrapper {
public int checkCallingOrSelfPermission(String permission) {
return PackageManager.PERMISSION_GRANTED;
}
@Override
public Intent registerReceiverAsUser(BroadcastReceiver receiver,
UserHandle user, IntentFilter filter, String broadcastPermission,
Handler scheduler) {
return null;
}
}