diff options
| author | Chris Gross <chrisgross@google.com> | 2021-03-10 23:00:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-10 23:00:14 +0000 |
| commit | 1cb919df825afb10aaa5e796a7f4360be2d0ffd8 (patch) | |
| tree | 30edf79f5c62d947eb8086a5274ab28f847bce1a /keystore/java/android/security/KeyStore2.java | |
| parent | 984b7be598827be9938ce00b8f550ad4836bf67a (diff) | |
| parent | 4edca1117cdcad002c57f24db04b833088f2439b (diff) | |
Merge changes from topic "SP1A.210222.001" into s-keystone-qcom-dev
* changes:
Adapt to rename of DisplayConfig to DisplayMode.
Moves assignDisplayIdLocked to the Layout class.
Removes import of deprecated com.android.ims.ImsException.
Remove duplicate definitions of stringToAdnStringField().
Stops enforcing uses_libs matching AndroidManifest.xml for SystemUI.
Revert "CamcorderProfiles: Add 8KUHD camcorder profile"
Merge SP1A.210222.001
Diffstat (limited to 'keystore/java/android/security/KeyStore2.java')
| -rw-r--r-- | keystore/java/android/security/KeyStore2.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/keystore/java/android/security/KeyStore2.java b/keystore/java/android/security/KeyStore2.java index f7477bf92c81..476e4d7b7b18 100644 --- a/keystore/java/android/security/KeyStore2.java +++ b/keystore/java/android/security/KeyStore2.java @@ -107,7 +107,6 @@ public class KeyStore2 { try { return request.execute(service); } catch (ServiceSpecificException e) { - Log.e(TAG, "KeyStore exception", e); throw getKeyStoreException(e.errorCode); } catch (RemoteException e) { if (firstTry) { |