Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not show exception stack trace when no child profile key" into nyc-dev

Browse Source
This commit is contained in:
Ricky Wai
2016-05-04 10:47:53 +00:00
committed by Android (Google) Code Review
parent 92d0e9a4ed de3a068af6
commit 3423a513e7
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/LockSettingsService.java
View File

@@ -896,16 +896,14 @@ public class LockSettingsService extends ILockSettings.Stub {
// get credential from keystore when managed profile has unified lock // get credential from keystore when managed profile has unified lock
try { try {
savedCredential = getDecryptedPasswordForTiedProfile(userId); savedCredential = getDecryptedPasswordForTiedProfile(userId);
} catch (FileNotFoundException e) {
Slog.i(TAG, "Child profile key not found");
} catch (UnrecoverableKeyException | InvalidKeyException | KeyStoreException } catch (UnrecoverableKeyException | InvalidKeyException | KeyStoreException
| NoSuchAlgorithmException | NoSuchPaddingException | NoSuchAlgorithmException | NoSuchPaddingException
| InvalidAlgorithmParameterException | IllegalBlockSizeException | InvalidAlgorithmParameterException | IllegalBlockSizeException
| BadPaddingException | CertificateException | IOException e) { | BadPaddingException | CertificateException | IOException e) {
if (e instanceof FileNotFoundException) {
Slog.i(TAG, "Child profile key not found");
} else {
Slog.e(TAG, "Failed to decrypt child profile key", e); Slog.e(TAG, "Failed to decrypt child profile key", e);
} }
}
} else { } else {
if (currentHandle == null) { if (currentHandle == null) {
if (savedCredential != null) { if (savedCredential != null) {