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]]>
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]]>
Add powerbtnd thread (r-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: I4c294fbeecb2bdceb6ce6783189216da74597746]]>
Make sleep state configurable and add a fallback (r-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 Change-Id: Id4024dfc3d84c1d30681e69fad2485851935f717]]>
Revert "system_suspend: start early" This reverts commit 5c145c49cc83bfe37c740bcfd3f82715ee051122. try to fix "deep sleep" issue based on patch by Hamido]]>
Snap for 7682106 from 0857973e9ca14cfc7d9d885576fc405ac4cdf3a1 to sc-v2-release Change-Id: I445a9b49747af2776ceb438ff04b16b7857f9c04]]>
[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]]>
Snap for 7655020 from 3d5b9b71fcf9d4f5c02138022c0176f57b90ea6f to sc-v2-release Change-Id: Iedb5c68ff9a5ac35b3c7fb00179385879ce3066e]]>
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]]>
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]]>
Merge "Fix parsing certificate with fallback to PEM." into sc-dev]]>
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]]>
Snap for 7642774 from f9915a4de5aa32d3987e76b55dcca0973e68e7fa to sc-v2-release Change-Id: I20d93fbe76822c1dc86952edd44569d47c41a87d]]>
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]]>
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]]>
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]]>
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]]>
system_suspend: use "self" instead of getCallingPid() while reopening a file using fd While finding filename to re-open it using /proc/]]>/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 Change-Id: Ifd1cf383723bad35c0f2f20f0d4f16ca272d9c34
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/]]>" 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 Change-Id: I9e142f6526a1c0f836202725b593c624536c0f64
[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]]>
[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]]>
[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]]>
Merge stage-aosp-sc-ts-dev before making it an upstream Bug: 169893837 Merged-In: I333fd284a2e0d7abf1088ac170f6d02e304615a5 Change-Id: I1e0bbf9d4f44cb09fde0f6072d2440974ba64cc8]]>
Merge ab/7633965 Bug: 169893837 Merged-In: I333fd284a2e0d7abf1088ac170f6d02e304615a5 Change-Id: I66051fbcd1fe3cfca99ba828432019a99c0a3cae]]>
Snap for 7618979 from 12c00e8d9c284b5930e94892d30fbd0a24b34e3b to sc-v2-release Change-Id: I74b06a8d3f8135615b5a4e4fb5c6dce93a228f2e]]>
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]]>
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]]>
Snap for 7513903 from 865505a4b2fdf58e0aa8e2223bc46327514f120b to sc-v2-release Change-Id: Ie0cfaffee43bf842655a48a586651e89870ddf70]]>
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]]>
Wifi-Keystore: Add legacy keystore support. Bug: 191373871 Test: atest WifiLegacyKeystoreIntegrationTest Change-Id: I33201136b90d6cbe27fb35940d1d0b915b78e9c5]]>