diff options
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | keystore/java/android/security/KeyStoreException.java | 3 | ||||
| -rw-r--r-- | packages/CrashRecovery/aconfig/flags.aconfig | 11 | ||||
| -rw-r--r-- | packages/SettingsProvider/Android.bp | 1 |
4 files changed, 14 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp index 900fba03daa7..f0f11c1b300d 100644 --- a/Android.bp +++ b/Android.bp @@ -113,7 +113,7 @@ filegroup { ":android.security.legacykeystore-java-source", ":android.security.maintenance-java-source", ":android.security.metrics-java-source", - ":android.system.keystore2-V3-java-source", + ":android.system.keystore2-V4-java-source", ":android.hardware.cas-V1-java-source", ":credstore_aidl", ":dumpstate_aidl", diff --git a/keystore/java/android/security/KeyStoreException.java b/keystore/java/android/security/KeyStoreException.java index 5825facee021..eea5690dddf1 100644 --- a/keystore/java/android/security/KeyStoreException.java +++ b/keystore/java/android/security/KeyStoreException.java @@ -679,6 +679,9 @@ public class KeyStoreException extends Exception { sErrorCodeToFailureInfo.put(ResponseCode.OUT_OF_KEYS_REQUIRES_SYSTEM_UPGRADE, new PublicErrorInformation(IS_SYSTEM_ERROR | IS_TRANSIENT_ERROR, ERROR_DEVICE_REQUIRES_UPGRADE_FOR_ATTESTATION)); + sErrorCodeToFailureInfo.put(ResponseCode.GET_ATTESTATION_APPLICATION_ID_FAILED, + new PublicErrorInformation(IS_SYSTEM_ERROR | IS_TRANSIENT_ERROR, + ERROR_INTERNAL_SYSTEM_ERROR)); sErrorCodeToFailureInfo.put(ResponseCode.OUT_OF_KEYS_PENDING_INTERNET_CONNECTIVITY, new PublicErrorInformation(IS_SYSTEM_ERROR | IS_TRANSIENT_ERROR, ERROR_ATTESTATION_KEYS_UNAVAILABLE)); diff --git a/packages/CrashRecovery/aconfig/flags.aconfig b/packages/CrashRecovery/aconfig/flags.aconfig index 8cdef38356da..80412321d60b 100644 --- a/packages/CrashRecovery/aconfig/flags.aconfig +++ b/packages/CrashRecovery/aconfig/flags.aconfig @@ -12,15 +12,22 @@ flag { flag { name: "enable_crashrecovery" is_exported: true - namespace: "crashrecovery" + namespace: "modularization" description: "Enables various dependencies of crashrecovery module" bug: "289203818" } flag { name: "allow_rescue_party_flag_resets" - namespace: "crashrecovery" + namespace: "modularization" description: "Enables rescue party flag resets" bug: "287618292" is_fixed_read_only: true } + +flag { + name: "reenable_settings_resets" + namespace: "modularization" + description: "Re-enables settings resets only, deletes flag resets" + bug: "333847376" +} diff --git a/packages/SettingsProvider/Android.bp b/packages/SettingsProvider/Android.bp index cfe664e1156d..180e0b457355 100644 --- a/packages/SettingsProvider/Android.bp +++ b/packages/SettingsProvider/Android.bp @@ -32,6 +32,7 @@ android_library { "unsupportedappusage", ], static_libs: [ + "aconfig_demo_flags_java_lib", "device_config_service_flags_java", "libaconfig_java_proto_lite", "SettingsLibDeviceStateRotationLock", |