Improve log messages when CE key is already protected by secret
This is a bit of a hack, since ideally we should avoid logging errors in
the first place. But this CL is an improvement.
The following shows what the log looks like after this CL when
setCeStorageProtection() is called when the CE key is already protected:
I LockSettingsService: Encrypting CE key of user 0 with synthetic password
D vold : fscrypt_set_ce_key_protection 0
D vold : CE key already exists on-disk; re-protecting it with the given secret
D vold : Trying user CE key /data/misc/vold/user_keys/ce/0/current
E vold : Failed to read from /data/misc/vold/user_keys/ce/0/current/keymaster_key_blob: No such file or directory
E vold : decryptWithKeystoreKey failed
E vold : Failed to find working ce key for user 0
D vold : Trying user CE key /data/misc/vold/user_keys/ce/0/current
D vold : Successfully retrieved key
I vold : CE key is already protected by given secret. Nothing to do.
I vold : Errors above are for the attempt with empty auth and can be ignored.
Test: Upgraded a device from UQ1A to main with this CL. Checked the log.
Flag: EXEMPT just changes log messages
Change-Id: I5cf4bd0a1fcac80e9c192628fb7d112c0d320376
1 file changed