| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Snap for 7817384 from fdaf12c0520a469743d2fe01a6dabf798ee1e05c to simpleperf-...simpleperf-release | Android Build Coastguard Worker | 2021-10-12 | 25 | -7/+773 |
| |\ | |||||
| | * | Merge "Keystore 2.0: Fix generateKey documentation." | Treehugger Robot | 2021-10-08 | 1 | -3/+7 |
| | |\ | |||||
| | | * | Keystore 2.0: Fix generateKey documentation. | Janis Danisevskis | 2021-10-05 | 1 | -3/+7 |
| | * | | Merge Android 12 | Xin Li | 2021-10-06 | 24 | -4/+766 |
| | |\ \ | | |/ | |/| | |||||
| | | * | Merge "Fix parsing certificate with fallback to PEM." am: 0667b42031 | Treehugger Robot | 2021-09-10 | 4 | -110/+129 |
| | | |\ | | |/ | |/| | |||||
| | | * | system-suspend: Deprecate HIDL hal for Android T am: 23a83bc7d8 | Kalesh Singh | 2021-09-07 | 2 | -3/+5 |
| | | |\ | |||||
| | | * \ | Merge sc-dev-plus-aosp-without-vendor@7634622 | Xin Li | 2021-08-14 | 24 | -4/+766 |
| | | |\ \ | |||||
| | | | * \ | Reinstate PEM encoding for keystore certificate blobs. am: ddf9a67dc8 | Janis Danisevskis | 2021-08-06 | 3 | -5/+327 |
| | | | |\ \ | |||||
| | | | | * | | Reinstate PEM encoding for keystore certificate blobs.android12-dev | Janis Danisevskis | 2021-08-03 | 3 | -5/+327 |
| | | | * | | | Remove ndk_platform backend. Use the ndk backend. am: f7e5825444 am: c8fe6dda1f | Jiyong Park | 2021-07-28 | 4 | -10/+10 |
| | | | |\ \ \ | |||||
| | | | * \ \ \ | system_suspend: Implement system suspend AIDL hal am: e58b016a58 am: 7c3b120a60 | Kalesh Singh | 2021-07-23 | 9 | -55/+229 |
| | | | |\ \ \ \ | |||||
| | | | * \ \ \ \ | system-suspend: Add SystemSuspend AIDL hal interfaces am: 69e66503b5 am: 91c6... | Kalesh Singh | 2021-07-23 | 7 | -1/+229 |
| | | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | system-suspend: Extract HIDL specific code am: aa3e8e99d7 am: 4cb36b9f79 | Kalesh Singh | 2021-07-23 | 9 | -95/+191 |
| | | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | [LSC] Add LOCAL_LICENSE_KINDS to system/hardware/interfaces am: 160df8c30e am... | Bob Badour | 2021-07-07 | 1 | -0/+4 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | [automerger skipped] Wifi-Keystore: Add legacy keystore support. am: f88d7a38... | Janis Danisevskis | 2021-07-01 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ | Wifi-Keystore: Add legacy keystore support. am: 85ab3db50e | Janis Danisevskis | 2021-06-30 | 5 | -18/+280 |
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / | | | | |/| | | | | | | | |||||
| | | | | * | | | | | | | | Wifi-Keystore: Add legacy keystore support. | Janis Danisevskis | 2021-06-29 | 5 | -18/+280 |
| | | | * | | | | | | | | | Merge "Allow CompOS APEX to access Keystore AIDL." am: 68a8050f5b am: 0a181df8e0 | Alan Stokes | 2021-06-22 | 1 | -0/+4 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ | Merge "Revert "Revert "keystore aidl: set explicit default values""" am: 97dc... | Treehugger Robot | 2021-05-28 | 8 | -8/+8 |
| | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ | Freeze AIDL APIs for SC am: 22fd836441 | Jiyong Park | 2021-05-26 | 22 | -3/+764 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | | | |||||
| | | | | * | | | | | | | | | | Freeze AIDL APIs for SC | Jiyong Park | 2021-05-21 | 22 | -3/+764 |
| | | | * | | | | | | | | | | | Merge "Revert "keystore aidl: set explicit default values"" am: fbd16dcc82 am... | Treehugger Robot | 2021-05-22 | 8 | -8/+8 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge "keystore aidl: set explicit default values" am: 0528f848f2 am: 9998d1db7d | Treehugger Robot | 2021-05-20 | 8 | -8/+8 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ | [automerger skipped] Merge "suspend: Change good suspend time to total" am: 2... | Treehugger Robot | 2021-05-10 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / | | | | |/| | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | [automerger skipped] Merge "suspend: Change good suspend time to total" am: 2... | Treehugger Robot | 2021-05-10 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge "suspend: Change good suspend time to total" am: 22bbd096ca am: de8b38f0ec | Treehugger Robot | 2021-05-10 | 4 | -6/+10 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | Link VtsHalWifiKeystoreV1_0TargetTest statically. am: 22468a22b9 am: 860d26fd... | Janis Danisevskis | 2021-05-05 | 1 | -1/+1 |
| | | | |\| | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | Link VtsHalWifiKeystoreV1_0TargetTest statically. am: 22468a22b9 am: 860d26fd... | Janis Danisevskis | 2021-05-05 | 1 | -1/+1 |
| | | | | |\| | | | | | | | | | | | | | |||||
| | | | | | * | | | | | | | | | | | | | Link VtsHalWifiKeystoreV1_0TargetTest statically. am: 22468a22b9 am: 860d26fdca | Janis Danisevskis | 2021-05-05 | 1 | -1/+1 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | suspend: Change good suspend time to total am: 74fe319112 | Benjamin Schwartz | 2021-05-05 | 4 | -6/+10 |
| | | | |\| | | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | | suspend: Change good suspend time to total | Benjamin Schwartz | 2021-05-04 | 4 | -6/+10 |
| | | | |/ / / / / / / / / / / / / / / | |||||
| | | | * | | | | | | | | | | | | | | | Keystore 2.0: convertStorageKeyToEphemeral needs to upgrade the key blob am: ... | Janis Danisevskis | 2021-04-23 | 4 | -3/+80 |
| | | | |\| | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | Keystore 2.0: convertStorageKeyToEphemeral needs to upgrade the key blob am: ... | Janis Danisevskis | 2021-04-23 | 4 | -3/+80 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | Statically link VtsHalWifiKeystoreV1_0TargetTest against keystore2 interface ... | Janis Danisevskis | 2021-04-19 | 1 | -1/+2 |
| | | | |\| | | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | | Statically link VtsHalWifiKeystoreV1_0TargetTest against keystore2 interface ... | Janis Danisevskis | 2021-04-19 | 1 | -1/+2 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | | wifikeystore: Remove rpius@ from OWNERS | Roshan Pius | 2021-04-12 | 2 | -2/+2 |
| | | | * | | | | | | | | | | | | | | | | | Merge "Keystore 2.0: Add SensitiveData annotation." am: 0f1ec32d35 am: ea2f85... | Janis Danisevskis | 2021-04-08 | 5 | -2/+5 |
| | | | |\| | | | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | | | Merge "Keystore 2.0: Add SensitiveData annotation." am: 0f1ec32d35 am: ea2f85... | Janis Danisevskis | 2021-04-08 | 5 | -2/+5 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | | | Keystore 2.0: Observe canonicalization of service name. am: bea139a65e am: e5... | Janis Danisevskis | 2021-04-06 | 1 | -1/+2 |
| | | | |\| | | | | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | | | | Keystore 2.0: Observe canonicalization of service name. am: bea139a65e am: e5... | Janis Danisevskis | 2021-04-06 | 1 | -1/+2 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | | | | Keystore wifi: Fix getBlob not calling hidl callback on success. am: e7784711... | Janis Danisevskis | 2021-04-01 | 1 | -3/+1 |
| | | | |\| | | | | | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | | | | | Keystore wifi: Fix getBlob not calling hidl callback on success. am: e7784711... | Janis Danisevskis | 2021-04-01 | 1 | -3/+1 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | | | | | Canonicalize keystore2 service name. am: 847843acfe am: ad6ec4fbba am: 6b3028... | Janis Danisevskis | 2021-03-29 | 1 | -1/+1 |
| | | | |\| | | | | | | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | | | | | | Canonicalize keystore2 service name. am: 847843acfe am: ad6ec4fbba | Janis Danisevskis | 2021-03-29 | 1 | -1/+1 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | | | | | | Merge "Keystore 2.0: Remove Keystore 1.0" am: 4386ba6c16 am: d72c2b14cd am: a... | Janis Danisevskis | 2021-03-24 | 5 | -462/+82 |
| | | | |\| | | | | | | | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | | | | | | | Merge "Keystore 2.0: Remove Keystore 1.0" am: 4386ba6c16 am: d72c2b14cd | Janis Danisevskis | 2021-03-24 | 5 | -462/+82 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | Merge "Keystore 2.0: Introduce deleteKey to IKeystoreSecurityLevel" am: f18f8... | Satya Tangirala | 2021-03-24 | 3 | -1/+23 |
| | | | |\| | | | | | | | | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | | | | | | | | Merge "Keystore 2.0: Introduce deleteKey to IKeystoreSecurityLevel" am: f18f8... | Satya Tangirala | 2021-03-24 | 3 | -1/+23 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | Merge "Keystore 2.0: add convertStorageKeyToEphemeral to IKeystoreSecurityLev... | Satya Tangirala | 2021-03-24 | 4 | -0/+24 |
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | | | | | | | | | Merge "Keystore 2.0: add convertStorageKeyToEphemeral to IKeystoreSecurityLev... | Satya Tangirala | 2021-03-24 | 4 | -0/+24 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
