aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-10-10Snap for 9157512 from d2c589e358e3913846c246271811f4d1bf1fec73 to ↵aml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010Android Build Coastguard Worker
mainline-tzdata3-release Change-Id: Id2d956ff3835c875e0a7734c86f9ba64e2fc3667
2022-07-12Fix crash in `ReadFile` when the input file is empty. am: 8a25a05724 am: ↵A. Cody Schuffelen
3b296c3b37 Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/19224561 Change-Id: Ie5f5e03b71dc8fced1c59e8bc4ae041672d78d39 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12[automerger skipped] Fix filename comparison in FindFetcherConfig am: ↵Connor O'Brien
80ea72b461 -s ours am: ef75b69257 -s ours am skip reason: Merged-In Ic9be43155b97eacbb4e4834a648dd513fe60b567 with SHA-1 2e8e6b813a is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/19224560 Change-Id: I295d2ea787aa299f15541f845b1b99a9d4be8ce8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12Fix crash in `ReadFile` when the input file is empty. am: 8a25a05724A. Cody Schuffelen
Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/19224561 Change-Id: I1f28b0ffbc125afb346eee40aa3cfce5b676d444 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12[automerger skipped] Fix filename comparison in FindFetcherConfig am: ↵Connor O'Brien
80ea72b461 -s ours am skip reason: Merged-In Ic9be43155b97eacbb4e4834a648dd513fe60b567 with SHA-1 2e8e6b813a is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/19224560 Change-Id: I3b83f66416426172abbf343601bc090981030ce5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08Fix crash in `ReadFile` when the input file is empty.A. Cody Schuffelen
When the internal ifstream is in a `fail()` state `tellg()` returns -1, and passing that directly to `std::string::resize` causes it to throw an exception. We can avoid the exception by checking `fail()` first. Bug: 227657872 Test: Use with aosp/2048065 Change-Id: Ibb262c753ad90d044a0d8c28d439ea699a481b2b Merged-In: Ibb262c753ad90d044a0d8c28d439ea699a481b2b
2022-07-08Fix filename comparison in FindFetcherConfigConnor O'Brien
For any filename exactly 1 char shorter than kFetcherConfigFile, expected_pos == -1 and rfind() returns string::npos == -1, which incorrectly results in calling LoadFromFile. android::base::EndsWith() avoids this bug and matches the intent of the existing check. Bug: 187441427 Change-Id: Ic9be43155b97eacbb4e4834a648dd513fe60b567 Merged-In: Ic9be43155b97eacbb4e4834a648dd513fe60b567 Signed-off-by: Connor O'Brien <connoro@google.com>
2022-06-15Snap for 8730993 from c8aeb17a612b5c86e362b2d184c094ef8663c8a8 to ↵Android Build Coastguard Worker
mainline-tzdata3-release Change-Id: I0904dade34e1d12301a73aa68d59521b5bdbac85
2022-06-15Snap for 8727584 from cb5b3da97fb7dec488437d1df57a096b90c3dfbf to ↵Android Build Coastguard Worker
mainline-tzdata3-release Change-Id: I50cc5ac1e497514f820dd964f167e6b1082ae942
2022-06-13Merge "Use EffectLayer-backed color fade" into tm-dev am: 95bdc395ceTreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/18835757 Change-Id: I89ca1d0fb49df8bc9cfdb2a2a0074f26bbf05202 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13Merge "Use EffectLayer-backed color fade" into tm-devTreeHugger Robot
2022-06-13Use EffectLayer-backed color fadeAlec Mouri
Presubmit tests are breaking because of a difficult-to-resolve deadlock involving SurfaceFlinger, virtual displays, and the ColorFade-animation. To resolve this, enable the ColorFade variant that is backed by an EffectLayer, which does not involve buffer production and so sidesteps the deadlock. Bug: 233386717 Test: android.server.wm.MultiDisplayKeyguardTests Change-Id: I6c71a24e144ccf01fb0d74129ea048e927dc9bf7
2022-06-04Merge "Update PCI device root for crosvm arm64" am: 4071a9cfac am: ↵Alistair Delva
977f5d267c am: e643255e42 Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/18729264 Change-Id: I6c588fe6eacdbc7bf2d300b2fde0f91a94fbfb0e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03Merge "Update PCI device root for crosvm arm64" am: 4071a9cfac am: 977f5d267cAlistair Delva
Original change: https://android-review.googlesource.com/c/device/google/cuttlefish/+/2107147 Change-Id: I4982159c84818b88ca0ebdab554deeb7de32a2ff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> (cherry picked from commit 3f127ce69e5d910222970cc314bdfaeb65f721c6)
2022-06-02Merge "Implement SE root of trust provisioning." into tm-dev am: 5291954389TreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/18639873 Change-Id: Id1295439c4ad3e27e3ccbd09f138cce5683d364a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02Merge "Implement SE root of trust provisioning." into tm-devTreeHugger Robot
2022-06-02Merge "Apply clang-format to KM sources." into tm-dev am: aaeb517ed1TreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/18639872 Change-Id: Ibcbac46cc772c7330a14fd5756dc3ad31c8cbd6c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02Merge "Apply clang-format to KM sources." into tm-devTreeHugger Robot
2022-06-02Implement SE root of trust provisioning.Shawn Willden
Bug: 219076736 Test: VtsAidlKeyMintTargetTest Change-Id: Iada7fc1c44525ebde73feca42de36b5030993ce1 Merged-In: Iada7fc1c44525ebde73feca42de36b5030993ce1
2022-06-02Apply clang-format to KM sources.Shawn Willden
Bug: 219076736 Test: VtsAidlKeyMintTargetTest Change-Id: I6a006b98a398f667186a401b4a54ac09ecaf77da Merged-In: I6a006b98a398f667186a401b4a54ac09ecaf77da
2022-05-27[automerger skipped] radio: provide hardcoded IMEI and null IMEI-SV am: ↵Bo Hu
fbdb3829df -s ours am: 286b1390a4 -s ours am skip reason: Merged-In I3cfbb5604218c3fe22fb6c1a9f479855c682f00c with SHA-1 605aaf1471 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/18620254 Change-Id: Ie4ca3ca15bdf7d2ddf4b4a6f203947635ef1e54e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27[automerger skipped] radio: provide hardcoded IMEI and null IMEI-SV am: ↵Bo Hu
fbdb3829df -s ours am skip reason: Merged-In I3cfbb5604218c3fe22fb6c1a9f479855c682f00c with SHA-1 605aaf1471 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/18620254 Change-Id: I4e6cc4635a6fb33e7d4838de952e69ed064ff06c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26radio: provide hardcoded IMEI and null IMEI-SVBo Hu
The current values "----" are not expected, setting them to valid IMEI (15 digits, taking same values as older version of goldfish radio hal), and setting IMEI SV as empty. Bug: 230649354 Test: launch emulator and check IMEI Change-Id: I3cfbb5604218c3fe22fb6c1a9f479855c682f00c Merged-In: I3cfbb5604218c3fe22fb6c1a9f479855c682f00c (cherry picked from commit 605aaf1471b5281936987ca7249ade81e2979275)
2022-05-26[automerge] radio: provide hardcoded IMEI and null IMEI-SV 2p: 5154019c1fBo Hu
Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/18620247 Bug: 230649354 Change-Id: If3a304967ee1a713460c9702d52dc6054fa65601
2022-05-26radio: provide hardcoded IMEI and null IMEI-SVBo Hu
The current values "----" are not expected, setting them to valid IMEI (15 digits, taking same values as older version of goldfish radio hal), and setting IMEI SV as empty. Bug: 230649354 Test: launch emulator and check IMEI Change-Id: I3cfbb5604218c3fe22fb6c1a9f479855c682f00c (cherry picked from commit 605aaf1471b5281936987ca7249ade81e2979275)
2022-05-26radio: provide hardcoded IMEI and null IMEI-SV am: 605aaf1471Bo Hu
Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/18610838 Change-Id: I118f2b688dc797638977e2fbd029d9e5ef46acde Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26radio: provide hardcoded IMEI and null IMEI-SVBo Hu
The current values "----" are not expected, setting them to valid IMEI (15 digits, taking same values as older version of goldfish radio hal), and setting IMEI SV as empty. Bug: 230649354 Test: launch emulator and check IMEI Change-Id: I3cfbb5604218c3fe22fb6c1a9f479855c682f00c
2022-05-20Add further notification pregrants to cuttlefish am: d7d02d4ed0Nate Myren
Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/18383811 Change-Id: I7f20d917caf031fe9f7bf5abfbea626f7372ef1d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-17Snap for 8603585 from 299a14d134b7589cecec588a89a44c3ef4b800b1 to ↵Android Build Coastguard Worker
mainline-tzdata3-release Change-Id: I29b44d4d2a3911df2bd6052ead4d58cc6c96103d
2022-05-13Add further notification pregrants to cuttlefishNate Myren
Bug: 232469538 Bug: 232470607 Bug: 232470323 Test: manual Change-Id: Icbddaa3c02be2bbb477ab60258d9be9e982550c9
2022-05-12Enable BtAudio in CuttlefishJosh Wu
Test: atest hal_implementation_test Bug: 203490261 Change-Id: I851de6095b9d9b4a0c5993b9a5508cdd762c0c4f (cherry picked from commit 3c653b9180a8e6518c7bb35763e4a224a6cefff4)
2022-05-12Merge "Remove deprecated LTE_CA bitmask" into tm-dev am: 05e0b61c70Sarah Chin
Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/18336517 Change-Id: I07fd9b3f5fefced7aba39b89546aa344bd54afed Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12Merge "Remove radio interfaces from known missing list" into tm-dev am: ↵Devin Moore
ee63edcf2d Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/18322364 Change-Id: I11458684ea55d18a1d1d8c0846542ebc2683c2d4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12Merge "Remove deprecated LTE_CA bitmask" into tm-devSarah Chin
2022-05-12Merge "Remove radio interfaces from known missing list" into tm-devDevin Moore
2022-05-12Remove radio interfaces from known missing listDevin Moore
These V2 interfaces no longer exist, so don't need to be listed as known missing in hal_implementation_test. V2 exists for radio.network downstream and wasn't caught until attempting to remove it from the known missing list. Test: atest hal_implementation_test Bug: 225941299 Change-Id: I24aa5ebe05a2adb1ccee31c25b51005dc081c384 Merged-In: I24aa5ebe05a2adb1ccee31c25b51005dc081c384
2022-05-11Remove deprecated LTE_CA bitmaskSarah Chin
Test: atest CtsTelephonyTestCases Bug: 230492240 Change-Id: Ie69d99ddd8619aa4c1df652cb1c031280ef1feac
2022-05-12[automerger skipped] Merge "Enable BtAudio in Cuttlefish" into tm-dev am: ↵Alice Kuo
ed1bde3c91 -s ours am skip reason: Merged-In I851de6095b9d9b4a0c5993b9a5508cdd762c0c4f with SHA-1 062d38b133 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/18220007 Change-Id: Ie2b1d7bd97f24c9742a3aedaa1a67e20cf0b7e1f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12[automerger skipped] Enable BtAudio in Cuttlefish am: eb1b01b5ce -s oursJosh Wu
am skip reason: Merged-In I851de6095b9d9b4a0c5993b9a5508cdd762c0c4f with SHA-1 062d38b133 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/18220007 Change-Id: Ic719025a9bdf2439a5f1d4c2280737bf1b26c020 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12Merge "Enable BtAudio in Cuttlefish" into tm-devAlice Kuo
2022-05-10Merge "Fix CF implementation errors for CTS" into tm-dev am: 83ec14f1b4Sarah Chin
Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/18244153 Change-Id: I017b6c3ad24818d4fcf415ea358cdcfc933649c7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10Merge "[Cuttlefish] Add NEARBY_WIFI_DEVICES for Restore" into tm-dev am: ↵Chris Lee
db1bb469d3 Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/18155925 Change-Id: I2f0430a9314575143fc232a83c5640142b70bd6c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10Fixed car cuttlefish target XML issues am: 518373ee28Oscar Azucena
Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/18236978 Change-Id: I7e71616f72abbea1a1bc55f77c422eb543c089e4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10Merge "Fix CF implementation errors for CTS" into tm-devSarah Chin
2022-05-10Merge "[Cuttlefish] Add NEARBY_WIFI_DEVICES for Restore" into tm-devChris Lee
2022-05-09Fix CF implementation errors for CTSSarah Chin
Test: atest CtsTelephonyTestCases, RilE2eTests Bug: 230492240 Change-Id: Ide22242bac039e64e2771d596ffcd32ec9005cf3
2022-05-09Fixed car cuttlefish target XML issuesOscar Azucena
Added missing modules tags to the audiopolicy configuration for the automotive cuttlefish target. Also Added missing remote submix audio HAL module. Bug: 228863520 Test: atest audioInjection_receivesAudioConfigurationChangeCallback Change-Id: I99de8a621e5e0aeb5533d7a7718839bb56b97eaf Merged-In: I99de8a621e5e0aeb5533d7a7718839bb56b97eaf (cherry picked from commit 142f6b93986a1e65fc7001ac9940008a657c2a94)
2022-05-10[Cuttlefish] Add NEARBY_WIFI_DEVICES for RestoreChris.CC Lee
We used ACCESS_FINE_LOCATION to start a WiFi P2P connection. From Android T, the required permission is changed to NEARBY_WIFI_DERVICES instead. Bug: 219855567 Test: Manual tested on Oriole. Used a local built Restore APK which declares the use of the permission. Push that APK to the test Oriole and validate the permission is granted by default. Change-Id: Ie509e7a0a6a5328c6dd6d13ed7a965b69bf0f534
2022-05-09Enable BtAudio in CuttlefishJosh Wu
Test: atest hal_implementation_test Bug: 203490261 Change-Id: I851de6095b9d9b4a0c5993b9a5508cdd762c0c4f Merged-In: I851de6095b9d9b4a0c5993b9a5508cdd762c0c4f (cherry picked from commit 3c653b9180a8e6518c7bb35763e4a224a6cefff4)
2022-05-02Merge "CF handle MAX_PDP_CONTEXT for SETUP_DATA_CALL" into tm-dev am: 828719dd9fTreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/18105723 Change-Id: I29611c83be0917d372dc4b88a5d5edbf9f9d2825 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>