summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-10-08Skip ab/6749736 in stage.HEADmastermainXin Li
Merged-In: I99c036576a5cc12ced295fe635aa65c265e996bf Change-Id: I7a107b22c574877dade00986491ce07a44c8e312
2020-09-11[automerger skipped] Merge Android R am: 7a56081cce -s oursXin Li
am skip reason: Change-Id I5ba640a8fb8b578755c1a7366d368ef1d81f7160 with SHA-1 f43d76b40d is in history Original change: https://android-review.googlesource.com/c/device/google/taimen/+/1422328 Change-Id: Ic93a14028a22f1f73ce47d7c128bffcdbe5b77a2
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I5ba640a8fb8b578755c1a7366d368ef1d81f7160 Change-Id: If96e0ed2ac67e0bbfda6a6ddcb55a405d3d5e000
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I6421c2bcd0d8252ec1aafe0c316ebbca46f6fe20 Change-Id: I5ba640a8fb8b578755c1a7366d368ef1d81f7160
2020-08-19Use on_vendor VNDK APEX for non-REL build am: 038066f517Yo Chiang
Original change: https://android-review.googlesource.com/c/device/google/taimen/+/1402427 Change-Id: Ic9a92346b22120e3ba5e9c98b11b0b29b9986368
2020-08-17Use on_vendor VNDK APEX for non-REL buildYo Chiang
For non-REL branch, move VNDK APEX to /vendor partition so we don't need to update vendor.img prebuilt everytime there is a change in the VNDK libraries. For REL branch, the API/ABI surfaces of VNDK libraries are frozen so don't need to move to /vendor partition. Bug: 140136207 Test: Build on REL and non-REL branch Change-Id: Ibce24465b546c52bc447b4b28a474de2b4b53792
2020-07-01[automerger skipped] Remove unnecessary sysprop settings am: 18953b4917 am: ↵Jiyong Park
cb7455c1f6 -s ours am: 82095bf64c -s ours am skip reason: Change-Id I6d1dd46edba0ad69586791935fca0da484ef2746 with SHA-1 4744ee6eb6 is in history Original change: https://android-review.googlesource.com/c/device/google/taimen/+/1347164 Change-Id: I99c036576a5cc12ced295fe635aa65c265e996bf
2020-07-01[automerger skipped] Remove unnecessary sysprop settings am: 18953b4917 am: ↵Jiyong Park
cb7455c1f6 -s ours am skip reason: Change-Id I6d1dd46edba0ad69586791935fca0da484ef2746 with SHA-1 4744ee6eb6 is in history Original change: https://android-review.googlesource.com/c/device/google/taimen/+/1347164 Change-Id: I6421c2bcd0d8252ec1aafe0c316ebbca46f6fe20
2020-07-01Remove unnecessary sysprop settings am: 18953b4917Jiyong Park
Original change: https://android-review.googlesource.com/c/device/google/taimen/+/1347164 Change-Id: Ieaf671f1b27f4f408462f6f31f0ed915bdcdec93
2020-06-30Remove unnecessary sysprop settings am: 4744ee6eb6Jiyong Park
Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/12041863 Change-Id: I404864e08f3580d6e08c140dc6cd64d58e851867
2020-06-30Remove unnecessary sysprop settingsandroid-r-beta-3android-r-beta-2Jiyong Park
These debuf.sf.early_* properties have been inactive because they are all eclipsed by the settings in wahoo/device.mk. Specifically, // wahoo/device.mk PRODUCT_PROPERTY_OVERRIDES := a=10 // taimen/device.mk include wahoo/device.mk PRODUCT_PROPERTY_OVERRIDES += a=20 With above, PRODUCT_PROPERTY_OVERRIDES becomes "a=10 a=20" and the build system has chosen "a=10" via the uniq-pairs-by-first-component macro. This was because PRODUCT_* lists were designed with an assumption that those mk files are inherited (without being included) in which case the values from more specific *.mk file are 'prepended' (not appaended). Since the settings in taimen/device.mk has been obsolete, let's remove them. This problem was actually found with I9c073a21c8257987cf2378012cadaeeeb698a4fb where duplicated sysprop assignments are prohibited, which is an attempt to make the sysprop settings be agnostic to the confusing ordering behavior imposed by the product inheritance mechanism. Bug: 117892318 Bug: 158735147 Test: m Exempt-From-Owner-Approval: cherry-pick master Merged-In: I6d1dd46edba0ad69586791935fca0da484ef2746 (cherry picked from commit 695f1fbe29f2ea08ed3a5cefb0fa487bea9144f4) Change-Id: I6d1dd46edba0ad69586791935fca0da484ef2746
2020-06-30Remove unnecessary sysprop settingsJiyong Park
These debuf.sf.early_* properties have been inactive because they are all eclipsed by the settings in wahoo/device.mk. Specifically, // wahoo/device.mk PRODUCT_PROPERTY_OVERRIDES := a=10 // taimen/device.mk include wahoo/device.mk PRODUCT_PROPERTY_OVERRIDES += a=20 With above, PRODUCT_PROPERTY_OVERRIDES becomes "a=10 a=20" and the build system has chosen "a=10" via the uniq-pairs-by-first-component macro. This was because PRODUCT_* lists were designed with an assumption that those mk files are inherited (without being included) in which case the values from more specific *.mk file are 'prepended' (not appaended). Since the settings in taimen/device.mk has been obsolete, let's remove them. This problem was actually found with I9c073a21c8257987cf2378012cadaeeeb698a4fb where duplicated sysprop assignments are prohibited, which is an attempt to make the sysprop settings be agnostic to the confusing ordering behavior imposed by the product inheritance mechanism. Bug: 117892318 Bug: 158735147 Test: m Exempt-From-Owner-Approval: cherry-pick master Merged-In: I6d1dd46edba0ad69586791935fca0da484ef2746 (cherry picked from commit 695f1fbe29f2ea08ed3a5cefb0fa487bea9144f4) Change-Id: I6d1dd46edba0ad69586791935fca0da484ef2746
2020-06-22Merge changes from topic "am-5c49126713864de48797e12bf7acf180" into ↵Automerger Merge Worker
rvc-d1-dev-plus-aosp * changes: Merge "Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..."" into rvc-dev am: ba8fbc6237 am: 16fd1c3a2d Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." am: ac8a09f798 am: c9fc093ffb
2020-06-22Merge "Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..."" ↵Cyril Lee
into rvc-dev am: ba8fbc6237 am: 16fd1c3a2d Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11940861 Change-Id: If76de1a14e266319c5b238d460c4da0b7de977a3
2020-06-22Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." am: ↵Ken Chen
ac8a09f798 am: c9fc093ffb Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11940861 Change-Id: I8f50f70ee691b4938a9e52364847b6f02e1c9b7a
2020-06-22Merge "Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..."" ↵Cyril Lee
into rvc-dev am: ba8fbc6237 am: ee73c28eea Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11940861 Change-Id: I85e3476fe33dc2937192babc7798f122741fc9b3
2020-06-22Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." am: ↵Ken Chen
ac8a09f798 am: d5237a3d22 Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11940861 Change-Id: I2ad506cc26201d9e4282490f903c3955fae9e5ca
2020-06-22Merge "Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..."" ↵Cyril Lee
into rvc-dev am: ba8fbc6237 Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11940861 Change-Id: I0d2f10629c5d4fff815eea11d3ba42849796c971
2020-06-22Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." am: ↵Ken Chen
ac8a09f798 Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11940861 Change-Id: I93a5b1545066309a4855643ffe5539663da15d3e
2020-06-22Merge "Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..."" ↵android-11.0.0_r16android11-d1-b-releaseCyril Lee
into rvc-dev am: ba8fbc6237 Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11940861 Change-Id: I49560b5d9121a17110b0cd8a0107a2c3c79185d1
2020-06-22Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." am: ↵Ken Chen
ac8a09f798 Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11940861 Change-Id: I5410e0660814afafcbb4480d9611e7cee16f9c55
2020-06-22Merge "Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..."" ↵android11-devCyril Lee
into rvc-dev
2020-06-22Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..."Ken Chen
Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." Revert submission 11818631-deferred_medium_priority_actions Reason for revert: <investigate b/159568565> Reverted Changes: Id1d6d67f6:[DO NOT MERGE] Remove ASSIST_GESTURE action from d... I9bc31a200:[DO NOT MERGE] Remove ASSIST_GESTURE action from d... I9b033a06e:[DO NOT MERGE] Remove ASSIST_GESTURE action from d... I1633e191c:[DO NOT MERGE] Remove ASSIST_GESTURE action from d... I56d8f9e5d:[DO NOT MERGE] Remove ASSIST_GESTURE action from d... I086d2d9a5:[DO NOT MERGE] Remove ASSIST_GESTURE action from d... Ibc6e15d29:[DO NOT MERGE] Remove ASSIST_GESTURE action from d... I086d2d9a5:[DO NOT MERGE] Remove ASSIST_GESTURE action from d... Change-Id: I0d174786308589a8bd6eaa0453b8614008b509d9
2020-06-20Merge changes from topic "am-700a2a681bdb4a528bf52c8b1542452c" into ↵Automerger Merge Worker
rvc-d1-dev-plus-aosp * changes: Merge "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferred_medium_priority_actions resource" into rvc-dev am: ea000cd90c am: 74cea49ef7 [DO NOT MERGE] Remove ASSIST_GESTURE action from deferred_medium_priority_actions resource am: 7cf1a9368a am: 459d70f2dc
2020-06-20Merge "[DO NOT MERGE] Remove ASSIST_GESTURE action from ↵Cyril Lee
deferred_medium_priority_actions resource" into rvc-dev am: ea000cd90c am: 74cea49ef7 Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11867597 Change-Id: I8a2b210acbe9dfada3450831928536ac36a5397f
2020-06-20[DO NOT MERGE] Remove ASSIST_GESTURE action from ↵Cyril Lee
deferred_medium_priority_actions resource am: 7cf1a9368a am: 459d70f2dc Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11867597 Change-Id: I250d56afab895090d644fe089b5a5dc88888fe05
2020-06-20Merge "[DO NOT MERGE] Remove ASSIST_GESTURE action from ↵Cyril Lee
deferred_medium_priority_actions resource" into rvc-dev am: ea000cd90c am: 751fcec8bf Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11867597 Change-Id: I5a6d0ac9cbd6ba4795e7fe76a88b82a3cede330a
2020-06-20[DO NOT MERGE] Remove ASSIST_GESTURE action from ↵Cyril Lee
deferred_medium_priority_actions resource am: 7cf1a9368a am: 15c48cf059 Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11867597 Change-Id: Ie8ef69c70a0654f43df5484d3ffcea6c9c866a48
2020-06-20Merge "[DO NOT MERGE] Remove ASSIST_GESTURE action from ↵Cyril Lee
deferred_medium_priority_actions resource" into rvc-dev am: ea000cd90c Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11867597 Change-Id: If668cfef37471f97890ebea7c1c7a60c4da93b0e
2020-06-20[DO NOT MERGE] Remove ASSIST_GESTURE action from ↵Cyril Lee
deferred_medium_priority_actions resource am: 7cf1a9368a Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11867597 Change-Id: Id9e74de04ef49aa66c70ca2bd8506bacec96a1d8
2020-06-20Merge "[DO NOT MERGE] Remove ASSIST_GESTURE action from ↵Cyril Lee
deferred_medium_priority_actions resource" into rvc-dev am: ea000cd90c Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11867597 Change-Id: Ic469129133e296d2eacb33e5888af320746d97bf
2020-06-20[DO NOT MERGE] Remove ASSIST_GESTURE action from ↵Cyril Lee
deferred_medium_priority_actions resource am: 7cf1a9368a Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11867597 Change-Id: I56ecb82341d875db23e7cfd768716547d5d5e333
2020-06-20Merge "[DO NOT MERGE] Remove ASSIST_GESTURE action from ↵Cyril Lee
deferred_medium_priority_actions resource" into rvc-dev
2020-06-16[DO NOT MERGE] Remove ASSIST_GESTURE action from ↵Cyril Lee
deferred_medium_priority_actions resource We plan to disable active edge from P20 project. Since the deferred_medium_priority_actions contains ASSIST_GESTURE action and it will be the showing deferred setup condition. So we add a new PixelSetupWizardOverlayActiveEdge RRO package to enable this action from deferred_medium_priority_actions for P19 and older project. go/suw-disable-activie-edge Bug: 158540758 Test: manual test Change-Id: I9b033a06e04ea6c97003d972058e0c7b0349d6c9
2020-06-11audio: update microphone information am: d5d8262550 am: fa894ffff5Jasmine Cha
Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11788083 Change-Id: Icb713af4648f057a6245e12d160f3b4d63396453
2020-06-11audio: update microphone information am: d5d8262550 am: 2d517bc0b2Jasmine Cha
Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11788083 Change-Id: I8941b819b257e3a0187b9c732e4f0ff1a304da1a
2020-06-11audio: update microphone information am: d5d8262550Jasmine Cha
Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11788083 Change-Id: I3bcbfbc40b79f8efbf5fa6d7a386f6062ecec827
2020-06-11audio: update microphone information am: d5d8262550Jasmine Cha
Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11788083 Change-Id: I50ff7f9d16f35bbe9b40a70c2b5d828fb9b02129
2020-06-10audio: update microphone informationJasmine Cha
Update "microphone_characteristics" and "input_snd_device_mic_mapping". Test: manual regression test Bug: 155053215 Signed-off-by: Jasmine Cha <chajasmine@google.com> Change-Id: If43cdc600f1e9165034f8865aaa42772ea54041f
2020-06-08[automerger skipped] Merge QQ3A.200605.002 into master am: 233d637b10 -s ↵Xin Li
ours am: 32065add02 -s ours am: 854e78e9af -s ours am skip reason: Change-Id Id2344f20d1882f55f2ab57ae4185f1b0cecd23d1 with SHA-1 de6d41a44c is in history Original change: https://android-review.googlesource.com/c/device/google/taimen/+/1323305 Change-Id: I14683c68c90f7b8954b79c4dffc2fe6cade9477c
2020-06-08[automerger skipped] Merge QQ3A.200605.002 into master am: 233d637b10 -s ↵Xin Li
ours am: 32065add02 -s ours am skip reason: Change-Id Id2344f20d1882f55f2ab57ae4185f1b0cecd23d1 with SHA-1 de6d41a44c is in history Original change: https://android-review.googlesource.com/c/device/google/taimen/+/1323305 Change-Id: Ib09ec4221782b4b791ac78676d21c8562ba5f0fb
2020-06-08[automerger skipped] Merge QQ3A.200605.002 into master am: 233d637b10 -s oursXin Li
am skip reason: Change-Id Id2344f20d1882f55f2ab57ae4185f1b0cecd23d1 with SHA-1 de6d41a44c is in history Original change: https://android-review.googlesource.com/c/device/google/taimen/+/1323305 Change-Id: Ic1c09d6b58f6c40add675b4008308906838aa196
2020-06-03Merge QQ3A.200605.002 into masterXin Li
Bug: 158095402 Merged-In: Id2344f20d1882f55f2ab57ae4185f1b0cecd23d1 Change-Id: If57db5d2d623f003a9da4d6ab081035a15fb484d
2020-05-05Add METADATA to taimen: Apache2=NOTICE am: 6a7a2fb46b am: de6d41a44c am: ↵Bob Badour
84ca92f942 Change-Id: I9b28fea4b860f1bf7e23223e185cf775e8aa7a5d
2020-05-05Add METADATA to taimen: Apache2=NOTICE am: 6a7a2fb46b am: de6d41a44cBob Badour
Change-Id: I3229b695e5888ea89e3f3e428e4bdf9c7d51ddcb
2020-05-05Add METADATA to taimen: Apache2=NOTICE am: 6a7a2fb46btemp_QQ3A.200605.002Bob Badour
Change-Id: Id2344f20d1882f55f2ab57ae4185f1b0cecd23d1
2020-05-01Add METADATA to taimen: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I9ec6ca53fc9ddeb4782fad028a30aaadd5dd3db8
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 3bbff1dfab -s ours am: ec5145f1cf Change-Id: I93b1e18af550c480dcf7212992105617a3d47fda
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 3bbff1dfab -s ours am skip reason: subject contains skip directive Change-Id: Ief7b855dfdb3471c48f73ddde7c057289c5e584d
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I5ccf7acbc28bbd1850177720113dc3dbcd8297a7
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 09:02:12 +0000