summaryrefslogtreecommitdiff
path: root/core/java/android/security
Commit message (Expand)AuthorAgeFilesLines
* Merge "Revert "Revert "Keystore SPI: Initialize KeymasterDefs contants with A...Treehugger Robot2020-12-011-167/+258
|\
| * Revert "Revert "Keystore SPI: Initialize KeymasterDefs contants with AIDL gen...Janis Danisevskis2020-11-301-167/+258
* | Merge "Revert "Keystore SPI: Initialize KeymasterDefs contants with AIDL gene...Louis Chang2020-11-301-258/+167
|\|
| * Revert "Keystore SPI: Initialize KeymasterDefs contants with AIDL generated e...Louis Chang2020-11-301-258/+167
* | Merge "Keystore SPI: Initialize KeymasterDefs contants with AIDL generated en...Janis Danisevskis2020-11-271-167/+258
|\|
| * Keystore SPI: Initialize KeymasterDefs contants with AIDL generated enumsJanis Danisevskis2020-11-231-167/+258
* | Merge "Adds two missing Keymaster definitions." am: 6d7e4c43d6 am: faefa76349...Bram Bonné2020-11-231-0/+2
|\|
| * Adds two missing Keymaster definitions.Bram Bonné2020-11-191-0/+2
| * Merge "Add maxTargetSdk restriction to unused APIs."Mathew Inwood2020-11-0911-24/+35
| |\
| | * Add maxTargetSdk restriction to unused APIs.Mathew Inwood2020-11-0411-24/+35
* | | Merge changes Ib3c9affb,I1dbe3d02,I88681f21 am: 1f65c6b62e am: f2abffe107 am:...Treehugger Robot2020-11-061-0/+5
|\ \ \
| * | | Merge changes Ib3c9affb,I1dbe3d02,I88681f21 am: 1f65c6b62e am: f2abffe107 am:...Treehugger Robot2020-11-061-0/+5
| |\| |
| | * | Keystore SPI: Add SecurityLevelEnum to KeyPropertiesJanis Danisevskis2020-11-051-0/+5
| | |/
* | | Merge changes I7c17ab51,I5bd4acb4,I93270f00 am: 18bbac10c1 am: 68acc834d4 am:...Janis Danisevskis2020-11-021-0/+3
|\| |
| * | Merge changes I7c17ab51,I5bd4acb4,I93270f00 am: 18bbac10c1 am: 68acc834d4 am:...Janis Danisevskis2020-11-021-0/+3
| |\|
| | * Add KM_ERROR_HARDWARE_TYPE_UNAVAILABLE to KeymasterDefsJanis Danisevskis2020-10-271-0/+3
| | * Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-3110-22/+159
| | |\
| * | | Add maxTargetSdk restriction to unused APIs.Mathew Inwood2020-11-0211-24/+35
* | | | Add maxTargetSdk restriction to unused APIs.Mathew Inwood2020-10-2911-24/+35
* | | | Merge "Revert "Add maxTargetSdk restriction to unused APIs.""Hongwei Wang2020-10-2811-35/+24
|\ \ \ \
| * | | | Revert "Add maxTargetSdk restriction to unused APIs."Hongwei Wang2020-10-2811-35/+24
* | | | | Merge "Include cause in exceptions thrown by RecoveryController."Dmitry Dementyev2020-10-281-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Include cause in exceptions thrown by RecoveryController.Dmitry Dementyev2020-10-271-1/+1
* | | | | Add maxTargetSdk restriction to unused APIs.Mathew Inwood2020-10-2711-24/+35
|/ / / /
* / / / Add @Nullable annotation to the parameter of Object.equals() methods.Roman Kalukiewicz2020-10-152-2/+7
|/ / /
* | / Merge "Update comment to use inclusive language" am: 3b7913607b am: 03e5841ec1Treehugger Robot2020-07-291-1/+1
|\| | | |/ |/|
| * Update comment to use inclusive languageJoel Galenson2020-07-281-1/+1
| * Merge "ConfirmationPrompt: Use default values for UIOptions"Janis Danisevskis2020-01-231-14/+10
| |\
| | * ConfirmationPrompt: Use default values for UIOptionsJanis Danisevskis2020-01-231-14/+10
| * | Use new UnsupportedAppUsage annotation.Artur Satayev2020-01-0912-13/+15
| |/
| * resolve merge conflicts of fe9b32e4bed2737bc5dfe518a201a0c84fb4aa20 to qt-dev...Neil Fuller2019-04-111-5/+3
| |\
| | * Switch from Byte.toHexString() to HexEncodingNeil Fuller2019-04-111-5/+3
| | * Add @UnsupportedAppUsage annotationsAndrei Onea2019-03-225-0/+16
| | * Adding KEY_PERMANENTLY_INVALIDATED intMax Bires2019-02-182-4/+9
* | | Respect app-ops permission in FileIntegrityServiceVictor Hsieh2020-03-272-3/+6
* | | Resolve conflicting values of usesCleartextTraffic for shared processesAshwini Oruganti2020-02-211-1/+30
* | | Merge "Move cacerts_wfa from system to Wifi APEX"David Su2020-01-281-1/+4
|\ \ \
| * | | Move cacerts_wfa from system to Wifi APEXDavid Su2020-01-221-1/+4
* | | | ConfirmationPrompt: Use default values for UIOptionsJanis Danisevskis2020-01-221-14/+10
|/ / /
* | | Use new UnsupportedAppUsage annotation.Artur Satayev2020-01-0712-13/+15
* | | Merge "New API for query trust of a fs-verity certificate"TreeHugger Robot2019-12-232-0/+103
|\ \ \
| * | | New API for query trust of a fs-verity certificateVictor Hsieh2019-12-232-0/+103
* | | | Replace com.android.internal.util.Preconditions.checkNotNull withDaulet Zhanguzin2019-12-185-20/+18
|/ / /
* | | Wire individual attestationEran Messeri2019-12-131-0/+1
* | | Switch from Byte.toHexString() to HexEncodingNeil Fuller2019-04-081-5/+3
|/ /
* | Add @UnsupportedAppUsage annotationsAndrei Onea2019-03-215-0/+16
* | Add @NonNull annotation to RecoveryController BuildersDmitry Dementyev2019-03-057-24/+27
* | All Parcelable CREATOR fields are @NonNull.Jeff Sharkey2019-02-2815-15/+15
* | Adding KEY_PERMANENTLY_INVALIDATED intMax Bires2019-02-182-6/+11
* | Add an optional metadata blob for recoverable application keysBo Zhu2019-01-172-2/+115