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 
am: 3423a513e7

* commit '3423a513e7c0c0a0a7ae0fada1fc684c990c0aa2':
  Do not show exception stack trace when no child profile key

Change-Id: I394a3dfd8c4eeae20e2c7e0c5a9228e1be14ca48
This commit is contained in:
Ricky Wai
2016-05-04 10:59:57 +00:00
committed by android-build-merger
parent 36a5898a02 3423a513e7
commit 4566c8c1d1
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -896,15 +896,13 @@ public class LockSettingsService extends ILockSettings.Stub {
// get credential from keystore when managed profile has unified lock
try {
savedCredential = getDecryptedPasswordForTiedProfile(userId);
} catch (FileNotFoundException e) {
Slog.i(TAG, "Child profile key not found");
} catch (UnrecoverableKeyException | InvalidKeyException | KeyStoreException
| NoSuchAlgorithmException | NoSuchPaddingException
| InvalidAlgorithmParameterException | IllegalBlockSizeException
| 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 {
if (currentHandle == null) {