OSDN Git Service
Chih-Wei Huang [Mon, 15 Nov 2021 03:56:05 +0000 (22:56 -0500)]
Add powerbtnd thread (s-x86)
Also send wakeup key on resume to ensure the system wakes up
normally.
Changelog:
(r-x86) Resolve conflicts in suspend/1.0/default/SystemSuspend.cpp
Change-Id: I7e717fec631c05fa01d18b6a844ef7b0ad747878
Change-Id: Icd2d6a7eee295cdc546f497e6f42a5bdc6800c80
Chih-Wei Huang [Mon, 20 Apr 2020 10:43:48 +0000 (18:43 +0800)]
Make sleep state configurable and add a fallback (s-x86)
This patch allows the user to set the sleep state target from
Android properties for wakeup_count method.
It also includes a fallback state if the default state is not
available and the user didn't set the sleep.state property.
Changelog:
(r-x86) Resolve conflict in suspend/1.0/default/SystemSuspend.cpp
(s-x86) Resolve conflict in suspend/1.0/default/SystemSuspend.cpp
Change-Id: I74e61b3f77cbded24578a8f9463dc4c6f3b660a7
Android Build Coastguard Worker [Sat, 28 Aug 2021 01:09:38 +0000 (01:09 +0000)]
Snap for
7682106 from
0857973e9ca14cfc7d9d885576fc405ac4cdf3a1 to sc-v2-release
Change-Id: I445a9b49747af2776ceb438ff04b16b7857f9c04
Bob Badour [Thu, 26 Aug 2021 19:05:31 +0000 (12:05 -0700)]
[LSC] Add LOCAL_LICENSE_KINDS to system/hardware/interfaces
Added SPDX-license-identifier-Apache-2.0 to:
wifi/keystore/1.0/default/test/Android.bp
Bug:
68860345
Bug:
151177513
Bug:
151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: I059c18464cd78ab9af9f4b3822780e3585318716
Android Build Coastguard Worker [Wed, 18 Aug 2021 23:13:45 +0000 (23:13 +0000)]
Snap for
7655020 from
3d5b9b71fcf9d4f5c02138022c0176f57b90ea6f to sc-v2-release
Change-Id: Iedb5c68ff9a5ac35b3c7fb00179385879ce3066e
Hai Shalom [Tue, 17 Aug 2021 19:17:05 +0000 (19:17 +0000)]
Merge "Fix parsing certificate with fallback to PEM." into sc-dev am:
861703995c am:
2edd3c0572
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
15567011
Change-Id: Ie7ae80f1b4a577de4b03e625462c9e3868e38e3e
Hai Shalom [Tue, 17 Aug 2021 18:22:32 +0000 (18:22 +0000)]
Merge "Fix parsing certificate with fallback to PEM." into sc-dev am:
861703995c
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
15567011
Change-Id: I8370bf147075395ad768c693fe3252733b5538ec
Hai Shalom [Tue, 17 Aug 2021 18:07:26 +0000 (18:07 +0000)]
Merge "Fix parsing certificate with fallback to PEM." into sc-dev
Janis Danisevskis [Sat, 14 Aug 2021 00:46:22 +0000 (17:46 -0700)]
Fix parsing certificate with fallback to PEM.
Also moving extractPubKey to wifikeystorehal_utils.h for visibility
for unit testing.
Bug:
196323960
Test: WifiLegacyKeystoreIntegrationTest
Merged-In: I2374de6566355b24b6678d6876481f576aae6c37
Change-Id: I2374de6566355b24b6678d6876481f576aae6c37
Android Build Coastguard Worker [Sat, 14 Aug 2021 21:10:00 +0000 (21:10 +0000)]
Snap for
7642774 from
f9915a4de5aa32d3987e76b55dcca0973e68e7fa to sc-v2-release
Change-Id: I20d93fbe76822c1dc86952edd44569d47c41a87d
Manish Varma [Sat, 14 Aug 2021 01:12:21 +0000 (01:12 +0000)]
system_suspend: use "self" instead of getCallingPid() while reopening a file using fd am:
b4fb2123d6 am:
b2fddbe60f
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
15563459
Change-Id: I63e48ab2c30621f79d8e1f594e401bf4cdffc99f
Manish Varma [Sat, 14 Aug 2021 01:12:20 +0000 (01:12 +0000)]
system_suspend: allow SystemSuspend to re-open the fd if found stale am:
5e3700ea44 am:
9a1db0efca
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
15562861
Change-Id: I2b1dbcd87c3fdbaa9869a48e9e7ac6caa5660283
Manish Varma [Sat, 14 Aug 2021 00:57:17 +0000 (00:57 +0000)]
system_suspend: use "self" instead of getCallingPid() while reopening a file using fd am:
b4fb2123d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
15563459
Change-Id: I11b319ed65b7deda4ac9661d932edf44a6f4492e
Manish Varma [Sat, 14 Aug 2021 00:57:17 +0000 (00:57 +0000)]
system_suspend: allow SystemSuspend to re-open the fd if found stale am:
5e3700ea44
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
15562861
Change-Id: I4de95256960d90e099d440839deae8b22af728c2
Manish Varma [Fri, 13 Aug 2021 16:18:54 +0000 (09:18 -0700)]
system_suspend: use "self" instead of getCallingPid() while reopening a file using fd
While finding filename to re-open it using /proc/<pid>/fd/<fd> mechanism,
we need pid of the process and fd associated with that. Previous solution
was using getCallingPid() to get the pid of the process, which might not
be super accurate, as it would give the pid of the process that requested
the current binder transaction from system suspend, and hence the fd
would point to some other file, safe is use to use "self" instead to
assure that the same file is being referred.
Bug:
192813633
Test: SystemSuspendV1_0UnitTest
Signed-off-by: Manish Varma <varmam@google.com>
Change-Id: Ifd1cf383723bad35c0f2f20f0d4f16ca272d9c34
Manish Varma [Tue, 10 Aug 2021 22:07:55 +0000 (15:07 -0700)]
system_suspend: allow SystemSuspend to re-open the fd if found stale
Based on the BR it is evedent that when kernel fails to write any
wakeup reasons in /sys/kernel/wakeup_reasons/last_resume_reason, i.e.
if the file is read empty by system_suspend then the file descriptor
associated with that file becomes stale and cannot read the file
contents anymore, and all the subsequent attempts to read the
wakeup_reason returns empty which causes flurry of "unknown" wakeup
reasons.
Also, kernel only writes the wakeup reason in the sysfs node upon read()
call to the sysfs node, and hence it is not possible to know ahead of
time if the kernel is going to return empty file.
While we cannot prevent this error condition, we can certainly receover
re-opening the fd associated with "last_resume_reason" file.
Since it's main that opens all the files and pass their file descriptors
to SystemSuspend.cpp to do further file handling. This change will
re-open file for that stale fd using "/proc/self/fd/<fd>" when it
detects the failure condition, i.e. when an attempt to read
last_resume_reason file returns empty.
Bug:
192813633
Test: SystemSuspendV1_0UnitTest
Signed-off-by: Manish Varma <varmam@google.com>
Change-Id: I9e142f6526a1c0f836202725b593c624536c0f64
Xin Li [Fri, 13 Aug 2021 21:20:29 +0000 (21:20 +0000)]
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am:
e2f08410be -s ours am:
c73be3887a -s ours
am skip reason: Merged-In I333fd284a2e0d7abf1088ac170f6d02e304615a5 with SHA-1
ddf9a67dc8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
15546140
Change-Id: Ic5da6b0c9bf4f68587961199fcf1018b2e929dbc
Xin Li [Fri, 13 Aug 2021 20:53:33 +0000 (20:53 +0000)]
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am:
e2f08410be -s ours
am skip reason: Merged-In I333fd284a2e0d7abf1088ac170f6d02e304615a5 with SHA-1
ddf9a67dc8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
15546140
Change-Id: I22426af8d24f176b9d104a3f358c88adab6a1899
The Android Open Source Project [Fri, 13 Aug 2021 19:33:46 +0000 (19:33 +0000)]
[automerger skipped] Merge ab/
7633965 am:
d49624400b -s ours
am skip reason: Merged-In I333fd284a2e0d7abf1088ac170f6d02e304615a5 with SHA-1
ddf9a67dc8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
15546489
Change-Id: I3ae6491696dd453008efcabf802ab0a1823d95a0
Xin Li [Fri, 13 Aug 2021 00:49:10 +0000 (17:49 -0700)]
Merge stage-aosp-sc-ts-dev before making it an upstream
Bug:
169893837
Merged-In: I333fd284a2e0d7abf1088ac170f6d02e304615a5
Change-Id: I1e0bbf9d4f44cb09fde0f6072d2440974ba64cc8
The Android Open Source Project [Thu, 12 Aug 2021 19:03:39 +0000 (12:03 -0700)]
Merge ab/
7633965
Bug:
169893837
Merged-In: I333fd284a2e0d7abf1088ac170f6d02e304615a5
Change-Id: I66051fbcd1fe3cfca99ba828432019a99c0a3cae
Android Build Coastguard Worker [Sat, 7 Aug 2021 03:10:04 +0000 (03:10 +0000)]
Snap for
7618979 from
12c00e8d9c284b5930e94892d30fbd0a24b34e3b to sc-v2-release
Change-Id: I74b06a8d3f8135615b5a4e4fb5c6dce93a228f2e
Janis Danisevskis [Fri, 6 Aug 2021 03:43:10 +0000 (03:43 +0000)]
Reinstate PEM encoding for keystore certificate blobs. am:
ddf9a67dc8
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
15423463
Change-Id: Idb33495b2432bc9485e5f15c6baf34299fecdde9
Janis Danisevskis [Fri, 30 Jul 2021 00:27:06 +0000 (17:27 -0700)]
Reinstate PEM encoding for keystore certificate blobs.
Wifi HALs (wpa_supplicant) only understand PEM encoded certificates.
So we have to check and convert every certificate loaded form keystore2
or legacy keystore to PEM encoding.
Test: atest VtsHalWifiKeystoreV1_0TargetTest
atest WifiLegacyKeystoreIntegrationTest
Bug:
190223327
Change-Id: I333fd284a2e0d7abf1088ac170f6d02e304615a5
Android Build Coastguard Worker [Fri, 2 Jul 2021 01:13:29 +0000 (01:13 +0000)]
Snap for
7513903 from
865505a4b2fdf58e0aa8e2223bc46327514f120b to sc-v2-release
Change-Id: Ie0cfaffee43bf842655a48a586651e89870ddf70
Janis Danisevskis [Wed, 30 Jun 2021 19:58:08 +0000 (19:58 +0000)]
Wifi-Keystore: Add legacy keystore support. am:
85ab3db50e
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
14983121
Change-Id: I0dc6e14b2abaa69f16a8b285946ff8aed91c22b3
Janis Danisevskis [Tue, 15 Jun 2021 17:27:12 +0000 (10:27 -0700)]
Wifi-Keystore: Add legacy keystore support.
Bug:
191373871
Test: atest WifiLegacyKeystoreIntegrationTest
Change-Id: I33201136b90d6cbe27fb35940d1d0b915b78e9c5
android-build-team Robot [Thu, 27 May 2021 01:10:16 +0000 (01:10 +0000)]
Snap for
7401515 from
394ee06b426e1ae48ff1fe022acb6b762b1b5c62 to sc-v2-release
Change-Id: Icf17c355678f79b3dc9a465648886885855b34e9
Jiyong Park [Tue, 25 May 2021 23:02:33 +0000 (23:02 +0000)]
Freeze AIDL APIs for SC am:
22fd836441
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
14671699
Change-Id: I4c436788352c191ed868c6a66bcf25961f6aa51c
Jiyong Park [Fri, 21 May 2021 02:23:27 +0000 (11:23 +0900)]
Freeze AIDL APIs for SC
Bug:
188713899
Test: m
Change-Id: I2c5106f03ad3627d4563246713ae93bc8e435547
android-build-team Robot [Sat, 15 May 2021 03:10:19 +0000 (03:10 +0000)]
Snap for
7362794 from
a12b6808884b03943da10dc969b28aaf05731996 to sc-v2-release
Change-Id: Iec8a4a2a11ac2334e27f8d0ba714feb3339db3ba
android-build-team Robot [Tue, 11 May 2021 01:10:07 +0000 (01:10 +0000)]
Snap for
7351654 from
69f73c2732db325134e5cd6abfe95f3c4ebfae8a to sc-v2-release
Change-Id: I5a36b2b9760928cc56da388ea5b81e077de6c50d
Treehugger Robot [Mon, 10 May 2021 20:17:03 +0000 (20:17 +0000)]
[automerger skipped] Merge "suspend: Change good suspend time to total" am:
22bbd096ca am:
de8b38f0ec am:
c90c02c687 -s ours am:
69f73c2732 -s ours
am skip reason: Merged-In Ibb0daa62259a05bc21a4e69ef298c1e92d7fb970 with SHA-1
74fe319112 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1696310
Change-Id: Iec81581362eb5c665e3cc4ef0d1605faca7cb0bb
Treehugger Robot [Mon, 10 May 2021 20:01:09 +0000 (20:01 +0000)]
[automerger skipped] Merge "suspend: Change good suspend time to total" am:
22bbd096ca am:
de8b38f0ec am:
c90c02c687 -s ours
am skip reason: Merged-In Ibb0daa62259a05bc21a4e69ef298c1e92d7fb970 with SHA-1
74fe319112 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1696310
Change-Id: I5a384e4847a746a26c38969a6cac05bbcd2d7e3f
Treehugger Robot [Mon, 10 May 2021 19:42:11 +0000 (19:42 +0000)]
Merge "suspend: Change good suspend time to total" am:
22bbd096ca am:
de8b38f0ec
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1696310
Change-Id: Ib24beed779eb51d01edf0578dfc81e61fbd9fe88
Treehugger Robot [Mon, 10 May 2021 18:58:39 +0000 (18:58 +0000)]
Merge "suspend: Change good suspend time to total" am:
22bbd096ca
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1696310
Change-Id: I2c49d60638d507c0b711188ebd0e087cf6e54b53
Treehugger Robot [Mon, 10 May 2021 18:27:33 +0000 (18:27 +0000)]
Merge "suspend: Change good suspend time to total"
android-build-team Robot [Thu, 6 May 2021 01:10:52 +0000 (01:10 +0000)]
Snap for
7339742 from
1448f12b4e827231954d38ff153c82aa1a052bc9 to sc-v2-release
Change-Id: Ia2abff49c265fccf786b268c4cb239dbd4821482
Janis Danisevskis [Wed, 5 May 2021 16:55:41 +0000 (16:55 +0000)]
Link VtsHalWifiKeystoreV1_0TargetTest statically. am:
22468a22b9 am:
860d26fdca am:
d915855cd5 am:
1448f12b4e
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1693925
Change-Id: Ie96bc7a02958d68ba7f346562048d075cc907cbd
Janis Danisevskis [Wed, 5 May 2021 16:41:56 +0000 (16:41 +0000)]
Link VtsHalWifiKeystoreV1_0TargetTest statically. am:
22468a22b9 am:
860d26fdca am:
d915855cd5
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1693925
Change-Id: I3aae65f09276e765fa29646f4c8a55151043c497
Janis Danisevskis [Wed, 5 May 2021 16:13:11 +0000 (16:13 +0000)]
Link VtsHalWifiKeystoreV1_0TargetTest statically. am:
22468a22b9 am:
860d26fdca
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1693925
Change-Id: Ifbe0f29cbe2c759989fdc362150b73c4cbee7254
Janis Danisevskis [Wed, 5 May 2021 15:53:58 +0000 (15:53 +0000)]
Link VtsHalWifiKeystoreV1_0TargetTest statically. am:
22468a22b9
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1693925
Change-Id: I1705d8ea0947ffa9a5f869edc2f83b464907c85a
Benjamin Schwartz [Wed, 5 May 2021 01:25:23 +0000 (01:25 +0000)]
suspend: Change good suspend time to total am:
74fe319112
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
14430419
Change-Id: I67ab3170dc2ddbdab463ebc14a0ea4d01cdc33f7
Benjamin Schwartz [Tue, 4 May 2021 21:29:18 +0000 (14:29 -0700)]
suspend: Change good suspend time to total
Good suspend time was confusing since its meaning changed depending on
whether short suspend backoff was enabled. Changing this to total so
that it is easier to understand.
Good suspend time would then be total - short
Bug:
187125424
Test: dumpsys suspend_control_internal
Test: atest SystemSuspendV1_0UnitTest
Change-Id: Ibb0daa62259a05bc21a4e69ef298c1e92d7fb970
(cherry picked from commit
74fe319112393d1d610f938c384e138b43fac5ec)
Merged-In: Ibb0daa62259a05bc21a4e69ef298c1e92d7fb970
Benjamin Schwartz [Tue, 4 May 2021 21:29:18 +0000 (14:29 -0700)]
suspend: Change good suspend time to total
Good suspend time was confusing since its meaning changed depending on
whether short suspend backoff was enabled. Changing this to total so
that it is easier to understand.
Good suspend time would then be total - short
Bug:
187125424
Test: dumpsys suspend_control_internal
Test: atest SystemSuspendV1_0UnitTest
Change-Id: Ibb0daa62259a05bc21a4e69ef298c1e92d7fb970
Janis Danisevskis [Mon, 3 May 2021 16:05:09 +0000 (09:05 -0700)]
Link VtsHalWifiKeystoreV1_0TargetTest statically.
Link VtsHalWifiKeystoreV1_0TargetTest statically against
libkeymint_support.so.
Bug:
184807005
Test: atest VtsHalWifiKeystoreV1_0TargetTest
Change-Id: I83e6e19a662baa4adfa074559b364a4f44e08841
android-build-team Robot [Sat, 24 Apr 2021 03:09:50 +0000 (03:09 +0000)]
Snap for
7310088 from
1a86ab32a2f64e1c41e18d6158d695b062167431 to sc-v2-release
Change-Id: I411f466e71b37b5bfa369d19e84d156e4b273a11
Janis Danisevskis [Sat, 24 Apr 2021 00:14:16 +0000 (00:14 +0000)]
Keystore 2.0: convertStorageKeyToEphemeral needs to upgrade the key blob am:
77009ca92f am:
85be219021 am:
164b161e6a am:
1a86ab32a2
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1681885
Change-Id: Id8db9ff3db642a85e72382688d20993739c79780
Janis Danisevskis [Fri, 23 Apr 2021 23:48:18 +0000 (23:48 +0000)]
Keystore 2.0: convertStorageKeyToEphemeral needs to upgrade the key blob am:
77009ca92f am:
85be219021 am:
164b161e6a
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1681885
Change-Id: Icc4db50dbc3bf153eb1342c15cfd2fc9a90215ae
Janis Danisevskis [Fri, 23 Apr 2021 23:25:35 +0000 (23:25 +0000)]
Keystore 2.0: convertStorageKeyToEphemeral needs to upgrade the key blob am:
77009ca92f am:
85be219021
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1681885
Change-Id: Ia022b912ca7e8d686f1b26ba7f884e775500e0a6
Janis Danisevskis [Fri, 23 Apr 2021 23:03:46 +0000 (23:03 +0000)]
Keystore 2.0: convertStorageKeyToEphemeral needs to upgrade the key blob am:
77009ca92f
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1681885
Change-Id: I3ce588aa19937060d702c07281a95d89fccd43f8
Janis Danisevskis [Mon, 19 Apr 2021 22:34:01 +0000 (15:34 -0700)]
Keystore 2.0: convertStorageKeyToEphemeral needs to upgrade the key blob
convertStorageKeyToEphemeral needs to be able to return an optional
upgraded key blob. In this patch we add EphemeralStorageKeyResponse
which holds the ephemeral key and an optional upgrade key blob.
Bug:
185811713
Test: N/A
Change-Id: I7a63ce279a50ce25a02534f8e3c1b77d22dd8446
android-build-team Robot [Tue, 20 Apr 2021 01:10:14 +0000 (01:10 +0000)]
Snap for
7295815 from
35a5e97b3f995f17ca0d5ea79ce846c859c777c1 to sc-v2-release
Change-Id: Id4da8af5c05f89409dc058461b8b19744533e2ae
Janis Danisevskis [Mon, 19 Apr 2021 18:45:51 +0000 (18:45 +0000)]
Statically link VtsHalWifiKeystoreV1_0TargetTest against keystore2 interface am:
8a1a6c87ac am:
9472c2dee9 am:
f9782c15d9 am:
35a5e97b3f
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1676530
Change-Id: Ie1aa086bf8038d91a67e8124e93af4925f2a6511
Janis Danisevskis [Mon, 19 Apr 2021 16:30:14 +0000 (16:30 +0000)]
Statically link VtsHalWifiKeystoreV1_0TargetTest against keystore2 interface am:
8a1a6c87ac am:
9472c2dee9 am:
f9782c15d9
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1676530
Change-Id: I1cbf031381173b3c19f491a7b5f35782fed90b0b
Janis Danisevskis [Mon, 19 Apr 2021 15:59:32 +0000 (15:59 +0000)]
Statically link VtsHalWifiKeystoreV1_0TargetTest against keystore2 interface am:
8a1a6c87ac am:
9472c2dee9
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1676530
Change-Id: I2044dbf59583a64c3f03604d31399303c8933f57
Janis Danisevskis [Mon, 19 Apr 2021 15:46:38 +0000 (15:46 +0000)]
Statically link VtsHalWifiKeystoreV1_0TargetTest against keystore2 interface am:
8a1a6c87ac
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1676530
Change-Id: Ic0996ca47ccd9bc800e7070c463264a8104005ed
Janis Danisevskis [Fri, 16 Apr 2021 17:12:31 +0000 (10:12 -0700)]
Statically link VtsHalWifiKeystoreV1_0TargetTest against keystore2 interface
Test dependencies are not automatically installed on the device. So
tests need to be statically linked against libraries not on the target.
Test: atest VtsHalWifiKeystoreV1_0TargetTest
Bug:
183971367
Bug:
184807005
Change-Id: I9fc22e8fc7b35ea42af1bad19a3d095d2c15e899
android-build-team Robot [Tue, 13 Apr 2021 01:11:08 +0000 (01:11 +0000)]
Snap for
7277590 from
4a83116407b85573a3ecc9a68dd07de17cdd3301 to sc-v2-release
Change-Id: Icc299096f466380269d584e0f8c27072076195b7
Roshan Pius [Mon, 12 Apr 2021 17:43:21 +0000 (10:43 -0700)]
wifikeystore: Remove rpius@ from OWNERS
Bug:
184966495
Test: N/A
Change-Id: I430eb65843ea25c64802aac40e61d500aa54b6ee
android-build-team Robot [Fri, 9 Apr 2021 01:10:10 +0000 (01:10 +0000)]
Snap for
7269314 from
422b303c5f9387e436620a00cec4f95d55b6f88f to sc-v2-release
Change-Id: Iff6950347d4ca989603819b6941c90e799411553
Janis Danisevskis [Thu, 8 Apr 2021 01:19:19 +0000 (01:19 +0000)]
Merge "Keystore 2.0: Add SensitiveData annotation." am:
0f1ec32d35 am:
ea2f852970 am:
09c12e7faf
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1643023
Change-Id: I325b52946fc59661e6c072c7a8ea5a6a28805b05
Janis Danisevskis [Thu, 8 Apr 2021 00:31:51 +0000 (00:31 +0000)]
Merge "Keystore 2.0: Add SensitiveData annotation." am:
0f1ec32d35 am:
ea2f852970
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1643023
Change-Id: Ie978d68b94323b5219b802700058ff1cdde8916b
Janis Danisevskis [Wed, 7 Apr 2021 22:55:05 +0000 (22:55 +0000)]
Merge "Keystore 2.0: Add SensitiveData annotation." am:
0f1ec32d35
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1643023
Change-Id: Iec11274a301f31a5a2783dd341877d561e59829e
Janis Danisevskis [Wed, 7 Apr 2021 21:35:26 +0000 (21:35 +0000)]
Merge "Keystore 2.0: Add SensitiveData annotation."
android-build-team Robot [Wed, 7 Apr 2021 01:09:59 +0000 (01:09 +0000)]
Snap for
7263361 from
dae59159d5129e11465647bfd9c781410615c2c7 to sc-v2-release
Change-Id: Ic28d76b68552cb907673e0a52c0850902b681d1e
Janis Danisevskis [Wed, 17 Mar 2021 17:13:35 +0000 (10:13 -0700)]
Keystore 2.0: Add SensitiveData annotation.
Bug:
174857732
Test: N/A
Change-Id: I97f7d6eba3d682749cb4d395df407945b3b15ba5
Janis Danisevskis [Tue, 6 Apr 2021 00:47:53 +0000 (00:47 +0000)]
Keystore 2.0: Observe canonicalization of service name. am:
bea139a65e am:
e58291f451 am:
ac4186ed3d
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1664770
Change-Id: I834be87f97292c88362e5ecbb6da3c56a0278c84
Janis Danisevskis [Tue, 6 Apr 2021 00:00:37 +0000 (00:00 +0000)]
Keystore 2.0: Observe canonicalization of service name. am:
bea139a65e am:
e58291f451
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1664770
Change-Id: I40ead06103f078497f9b5b84c60a65b735aaa5cd
Janis Danisevskis [Mon, 5 Apr 2021 23:18:55 +0000 (23:18 +0000)]
Keystore 2.0: Observe canonicalization of service name. am:
bea139a65e
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1664770
Change-Id: I5046f327548dddb763d82fd4561765464049117e
Janis Danisevskis [Mon, 5 Apr 2021 21:24:12 +0000 (14:24 -0700)]
Keystore 2.0: Observe canonicalization of service name.
Test: N/A
Bug:
184288069
Change-Id: I32ff824afbd0ea8d438ea8ef5409bb3fc25c3eae
android-build-team Robot [Fri, 2 Apr 2021 01:09:13 +0000 (01:09 +0000)]
Snap for
7253016 from
06cdc537a67c6d3246f2ef904591138b890098eb to sc-v2-release
Change-Id: I4f03c4447d82c18b3d125cb4e67ce17be84e7fb2
Janis Danisevskis [Thu, 1 Apr 2021 20:37:19 +0000 (20:37 +0000)]
Keystore wifi: Fix getBlob not calling hidl callback on success. am:
e77847112d am:
4ffa0d7b8b am:
abda824767
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1661930
Change-Id: I32ff02c7bea2dd7614055495ca1f698199dea3cf
Janis Danisevskis [Thu, 1 Apr 2021 20:13:03 +0000 (20:13 +0000)]
Keystore wifi: Fix getBlob not calling hidl callback on success. am:
e77847112d am:
4ffa0d7b8b
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1661930
Change-Id: I4131f2142228c720de88958e59d0a8eed2b98699
Janis Danisevskis [Thu, 1 Apr 2021 19:32:17 +0000 (19:32 +0000)]
Keystore wifi: Fix getBlob not calling hidl callback on success. am:
e77847112d
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1661930
Change-Id: Ie4002c1187ee286de6c2551de12c906b0f814be2
Janis Danisevskis [Thu, 1 Apr 2021 17:14:13 +0000 (10:14 -0700)]
Keystore wifi: Fix getBlob not calling hidl callback on success.
Bug:
184263711
Test: N/A
Change-Id: Id24a14dbd370ce1e67e743507452e13e691c9bd6
android-build-team Robot [Tue, 30 Mar 2021 01:09:10 +0000 (01:09 +0000)]
Snap for
7243396 from
e0d438b7a02c4dcb5510294e4199b2bb648419ea to sc-v2-release
Change-Id: I2fc75282606709457b0796fd1ec073d05e25a29c
Janis Danisevskis [Mon, 29 Mar 2021 19:08:45 +0000 (19:08 +0000)]
Canonicalize keystore2 service name. am:
847843acfe am:
ad6ec4fbba am:
6b3028b1f8
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1649708
Change-Id: Id527c4f8bdac20c5e57786f55399605f5e3c254d
Janis Danisevskis [Mon, 29 Mar 2021 18:22:24 +0000 (18:22 +0000)]
Canonicalize keystore2 service name. am:
847843acfe am:
ad6ec4fbba
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1649708
Change-Id: I3d58eb79b8cd62e1b90ff12ade1245938140e9fe
Janis Danisevskis [Mon, 29 Mar 2021 17:41:26 +0000 (17:41 +0000)]
Canonicalize keystore2 service name. am:
847843acfe
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1649708
Change-Id: Idc125fedcc21b6be6dd5c020f9f84892d72037bb
android-build-team Robot [Fri, 26 Mar 2021 01:09:08 +0000 (01:09 +0000)]
Snap for
7236705 from
704e09b7e8dcc32502fa3ab88a5f49802618e9f7 to sc-v2-release
Change-Id: I66f0bfd73b1a0f4378f57d5b03f5e8f0c6065728
Janis Danisevskis [Mon, 22 Mar 2021 22:17:48 +0000 (15:17 -0700)]
Canonicalize keystore2 service name.
Bug:
179907868
Test: N/A
Change-Id: I4f33d2df52eeae9647e165f4ea2135de777df735
android-build-team Robot [Thu, 25 Mar 2021 01:09:13 +0000 (01:09 +0000)]
Snap for
7233012 from
2cb009e0f87481a1b9ed5c6d0f394b156a181d81 to sc-v2-release
Change-Id: I7e820e71cb55227a0cd6c7abf3ec22c12dfeaa11
Janis Danisevskis [Wed, 24 Mar 2021 18:02:08 +0000 (18:02 +0000)]
Merge "Keystore 2.0: Remove Keystore 1.0" am:
4386ba6c16 am:
d72c2b14cd am:
a9baefc138
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1621750
Change-Id: I2cfae0883c55f82d18bacdf50dff35ab8fa90dfc
Janis Danisevskis [Wed, 24 Mar 2021 17:21:35 +0000 (17:21 +0000)]
Merge "Keystore 2.0: Remove Keystore 1.0" am:
4386ba6c16 am:
d72c2b14cd
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1621750
Change-Id: I61905fd14f0bfd8daf4df8ca24f9156eb04bb22d
Janis Danisevskis [Wed, 24 Mar 2021 16:51:15 +0000 (16:51 +0000)]
Merge "Keystore 2.0: Remove Keystore 1.0" am:
4386ba6c16
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1621750
Change-Id: If7d8ce4a444b1621614e0c4f2755ffe43fff854e
Janis Danisevskis [Wed, 24 Mar 2021 16:06:26 +0000 (16:06 +0000)]
Merge "Keystore 2.0: Remove Keystore 1.0"
Satya Tangirala [Wed, 24 Mar 2021 11:18:23 +0000 (11:18 +0000)]
Merge "Keystore 2.0: Introduce deleteKey to IKeystoreSecurityLevel" am:
f18f82af7d am:
d97f934cd8 am:
53717493e1
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1623126
Change-Id: I27af6848937128d02fc7364a6ebe3f0c10bc0f44
Satya Tangirala [Wed, 24 Mar 2021 10:53:36 +0000 (10:53 +0000)]
Merge "Keystore 2.0: Introduce deleteKey to IKeystoreSecurityLevel" am:
f18f82af7d am:
d97f934cd8
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1623126
Change-Id: I77fbcb839038b037997fe249e23694a1df65212e
Satya Tangirala [Wed, 24 Mar 2021 10:09:23 +0000 (10:09 +0000)]
Merge "Keystore 2.0: Introduce deleteKey to IKeystoreSecurityLevel" am:
f18f82af7d
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1623126
Change-Id: I391084017551bb6789b0f851faad31470a5a88c8
Satya Tangirala [Wed, 24 Mar 2021 09:36:05 +0000 (09:36 +0000)]
Merge "Keystore 2.0: Introduce deleteKey to IKeystoreSecurityLevel"
Satya Tangirala [Wed, 24 Mar 2021 05:49:43 +0000 (05:49 +0000)]
Merge "Keystore 2.0: add convertStorageKeyToEphemeral to IKeystoreSecurityLevel" am:
e18a543f2a am:
6d260eacea am:
e131bedf36
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1622901
Change-Id: If3d4f5a5fa86d6f73774bb2c8ecc3b008f580ed3
Satya Tangirala [Wed, 24 Mar 2021 05:02:25 +0000 (05:02 +0000)]
Merge "Keystore 2.0: add convertStorageKeyToEphemeral to IKeystoreSecurityLevel" am:
e18a543f2a am:
6d260eacea
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1622901
Change-Id: Ie0083b3da1c0662014172c3e168aa7d7a7f44175
Max Bires [Wed, 24 Mar 2021 04:48:06 +0000 (04:48 +0000)]
Merge "Adding new error to ResponseCode" am:
56096fd086 am:
ae6acb6ad1 am:
b7edbda4f3
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1614007
Change-Id: I2f721ddadc4022c54986b75a836bf109b78d5bd7
Satya Tangirala [Wed, 24 Mar 2021 04:19:29 +0000 (04:19 +0000)]
Merge "Keystore 2.0: add convertStorageKeyToEphemeral to IKeystoreSecurityLevel" am:
e18a543f2a
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1622901
Change-Id: I3ec2339047d7cd7b7a8cd184ad76c2614422fbc4
Max Bires [Wed, 24 Mar 2021 04:01:23 +0000 (04:01 +0000)]
Merge "Adding new error to ResponseCode" am:
56096fd086 am:
ae6acb6ad1
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1614007
Change-Id: I8c38a89e201d510a42179201669c12222b6d2e75
Satya Tangirala [Wed, 24 Mar 2021 03:43:38 +0000 (03:43 +0000)]
Merge "Keystore 2.0: add convertStorageKeyToEphemeral to IKeystoreSecurityLevel"
Max Bires [Wed, 24 Mar 2021 03:17:44 +0000 (03:17 +0000)]
Merge "Adding new error to ResponseCode" am:
56096fd086
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/
1614007
Change-Id: Ic524f3da27bf4cdbac2b4eae7f1fde490c3d375f
Max Bires [Wed, 24 Mar 2021 02:36:41 +0000 (02:36 +0000)]
Merge "Adding new error to ResponseCode"
android-build-team Robot [Wed, 24 Mar 2021 01:09:41 +0000 (01:09 +0000)]
Snap for
7230642 from
8213fa818ce38466f07c4897f954d63a3885516b to sc-v2-release
Change-Id: Id159fb33200442d5a960b83fc07cdba56fe801fa
OSDN Git Service
