summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Snap for 7817384 from fdaf12c0520a469743d2fe01a6dabf798ee1e05c to simpleperf-...simpleperf-releaseAndroid Build Coastguard Worker2021-10-1225-7/+773
|\
| * Merge "Keystore 2.0: Fix generateKey documentation."Treehugger Robot2021-10-081-3/+7
| |\
| | * Keystore 2.0: Fix generateKey documentation.Janis Danisevskis2021-10-051-3/+7
| * | Merge Android 12Xin Li2021-10-0624-4/+766
| |\ \ | | |/ | |/|
| | * Merge "Fix parsing certificate with fallback to PEM." am: 0667b42031Treehugger Robot2021-09-104-110/+129
| | |\ | | |/ | |/|
| | * system-suspend: Deprecate HIDL hal for Android T am: 23a83bc7d8Kalesh Singh2021-09-072-3/+5
| | |\
| | * \ Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li2021-08-1424-4/+766
| | |\ \
| | | * \ Reinstate PEM encoding for keystore certificate blobs. am: ddf9a67dc8Janis Danisevskis2021-08-063-5/+327
| | | |\ \
| | | | * | Reinstate PEM encoding for keystore certificate blobs.android12-devJanis Danisevskis2021-08-033-5/+327
| | | * | | Remove ndk_platform backend. Use the ndk backend. am: f7e5825444 am: c8fe6dda1fJiyong Park2021-07-284-10/+10
| | | |\ \ \
| | | * \ \ \ system_suspend: Implement system suspend AIDL hal am: e58b016a58 am: 7c3b120a60Kalesh Singh2021-07-239-55/+229
| | | |\ \ \ \
| | | * \ \ \ \ system-suspend: Add SystemSuspend AIDL hal interfaces am: 69e66503b5 am: 91c6...Kalesh Singh2021-07-237-1/+229
| | | |\ \ \ \ \
| | | * \ \ \ \ \ system-suspend: Extract HIDL specific code am: aa3e8e99d7 am: 4cb36b9f79Kalesh Singh2021-07-239-95/+191
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ [LSC] Add LOCAL_LICENSE_KINDS to system/hardware/interfaces am: 160df8c30e am...Bob Badour2021-07-071-0/+4
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ [automerger skipped] Wifi-Keystore: Add legacy keystore support. am: f88d7a38...Janis Danisevskis2021-07-010-0/+0
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Wifi-Keystore: Add legacy keystore support. am: 85ab3db50eJanis Danisevskis2021-06-305-18/+280
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / | | | | |/| | | | | | |
| | | | * | | | | | | | Wifi-Keystore: Add legacy keystore support.Janis Danisevskis2021-06-295-18/+280
| | | * | | | | | | | | Merge "Allow CompOS APEX to access Keystore AIDL." am: 68a8050f5b am: 0a181df8e0Alan Stokes2021-06-221-0/+4
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge "Revert "Revert "keystore aidl: set explicit default values""" am: 97dc...Treehugger Robot2021-05-288-8/+8
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Freeze AIDL APIs for SC am: 22fd836441Jiyong Park2021-05-2622-3/+764
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Freeze AIDL APIs for SCJiyong Park2021-05-2122-3/+764
| | | * | | | | | | | | | | Merge "Revert "keystore aidl: set explicit default values"" am: fbd16dcc82 am...Treehugger Robot2021-05-228-8/+8
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge "keystore aidl: set explicit default values" am: 0528f848f2 am: 9998d1db7dTreehugger Robot2021-05-208-8/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "suspend: Change good suspend time to total" am: 2...Treehugger Robot2021-05-100-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | [automerger skipped] Merge "suspend: Change good suspend time to total" am: 2...Treehugger Robot2021-05-100-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge "suspend: Change good suspend time to total" am: 22bbd096ca am: de8b38f0ecTreehugger Robot2021-05-104-6/+10
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Link VtsHalWifiKeystoreV1_0TargetTest statically. am: 22468a22b9 am: 860d26fd...Janis Danisevskis2021-05-051-1/+1
| | | |\| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Link VtsHalWifiKeystoreV1_0TargetTest statically. am: 22468a22b9 am: 860d26fd...Janis Danisevskis2021-05-051-1/+1
| | | | |\| | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | Link VtsHalWifiKeystoreV1_0TargetTest statically. am: 22468a22b9 am: 860d26fdcaJanis Danisevskis2021-05-051-1/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | suspend: Change good suspend time to total am: 74fe319112Benjamin Schwartz2021-05-054-6/+10
| | | |\| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | suspend: Change good suspend time to totalBenjamin Schwartz2021-05-044-6/+10
| | | |/ / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | Keystore 2.0: convertStorageKeyToEphemeral needs to upgrade the key blob am: ...Janis Danisevskis2021-04-234-3/+80
| | | |\| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Keystore 2.0: convertStorageKeyToEphemeral needs to upgrade the key blob am: ...Janis Danisevskis2021-04-234-3/+80
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Statically link VtsHalWifiKeystoreV1_0TargetTest against keystore2 interface ...Janis Danisevskis2021-04-191-1/+2
| | | |\| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Statically link VtsHalWifiKeystoreV1_0TargetTest against keystore2 interface ...Janis Danisevskis2021-04-191-1/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | wifikeystore: Remove rpius@ from OWNERSRoshan Pius2021-04-122-2/+2
| | | * | | | | | | | | | | | | | | | | Merge "Keystore 2.0: Add SensitiveData annotation." am: 0f1ec32d35 am: ea2f85...Janis Danisevskis2021-04-085-2/+5
| | | |\| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge "Keystore 2.0: Add SensitiveData annotation." am: 0f1ec32d35 am: ea2f85...Janis Danisevskis2021-04-085-2/+5
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Keystore 2.0: Observe canonicalization of service name. am: bea139a65e am: e5...Janis Danisevskis2021-04-061-1/+2
| | | |\| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Keystore 2.0: Observe canonicalization of service name. am: bea139a65e am: e5...Janis Danisevskis2021-04-061-1/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | Keystore wifi: Fix getBlob not calling hidl callback on success. am: e7784711...Janis Danisevskis2021-04-011-3/+1
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Keystore wifi: Fix getBlob not calling hidl callback on success. am: e7784711...Janis Danisevskis2021-04-011-3/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | Canonicalize keystore2 service name. am: 847843acfe am: ad6ec4fbba am: 6b3028...Janis Danisevskis2021-03-291-1/+1
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Canonicalize keystore2 service name. am: 847843acfe am: ad6ec4fbbaJanis Danisevskis2021-03-291-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Keystore 2.0: Remove Keystore 1.0" am: 4386ba6c16 am: d72c2b14cd am: a...Janis Danisevskis2021-03-245-462/+82
| | | |\| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Keystore 2.0: Remove Keystore 1.0" am: 4386ba6c16 am: d72c2b14cdJanis Danisevskis2021-03-245-462/+82
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "Keystore 2.0: Introduce deleteKey to IKeystoreSecurityLevel" am: f18f8...Satya Tangirala2021-03-243-1/+23
| | | |\| | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "Keystore 2.0: Introduce deleteKey to IKeystoreSecurityLevel" am: f18f8...Satya Tangirala2021-03-243-1/+23
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge "Keystore 2.0: add convertStorageKeyToEphemeral to IKeystoreSecurityLev...Satya Tangirala2021-03-244-0/+24
| | | |\| | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | Merge "Keystore 2.0: add convertStorageKeyToEphemeral to IKeystoreSecurityLev...Satya Tangirala2021-03-244-0/+24
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \