summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-05-06Disable LE audio related profiles for bonito am: 4e31cff4d4temp_sam_236045730Alice Kuo
Original change: https://android-review.googlesource.com/c/device/google/bonito/+/2089864 Change-Id: I42b6550860cc7446e6f6a4afec8a37dd9eaf3fff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06Disable LE audio related profiles for bonitoAlice Kuo
Bug: 231671426 Test: build Change-Id: I5585d3571b1f047b0b4587be91941c315f4340bb
2022-05-05Merge "Set default the Bluetooth class of device" am: 39cd44159dSal Savage
Original change: https://android-review.googlesource.com/c/device/google/bonito/+/2084165 Change-Id: I15b5b5700abe699b1e8f5d935f0feb6ad06b6a52 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05Merge "Set default the Bluetooth class of device"Sal Savage
2022-05-04[automerger skipped] Merge SP2A.220505.002 am: 3358d824f3 -s oursXin Li
am skip reason: Merged-In Ic2ed06886679671a04a35f86665cb147b8103905 with SHA-1 2f02dcb4ff is already in history Original change: https://android-review.googlesource.com/c/device/google/bonito/+/2085708 Change-Id: Ie67eaf95f66dde6efecfdeb814b510e2c24223b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03Merge SP2A.220505.002Xin Li
Bug: 231319788 Merged-In: Ic2ed06886679671a04a35f86665cb147b8103905 Change-Id: If57b905b6c2b165f3335af280c15174060ab2e1f
2022-05-03Use the ?= operator so BT properties can be overridden am: b83708a0aaSal Savage
Original change: https://android-review.googlesource.com/c/device/google/bonito/+/2080369 Change-Id: I41cdbacd64bbe5f68587317151fcbff2947e30cc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02Set default the Bluetooth class of deviceSal Savage
The class of device is a string with a list of uint8t values: 90,2,12 The meaning is as follows: {Service Field, Major class, Minor class} Service Field: 0x5A -> 90 Bit 17: Networking Bit 19: Capturing Bit 20: Object Transfer Bit 22: Telephony MAJOR_CLASS: 0x02 -> 2 (Phone) MINOR_CLASS: 0x0C -> 12 (Smart Phone) Bug: 217452259 Test: make -j; -- check that bluetooth.device.class_of_device is correct Merged-In: I70301be5e19f2cbc39b626621a62bc529974ca56 Change-Id: I70301be5e19f2cbc39b626621a62bc529974ca56
2022-04-28Use the ?= operator so BT properties can be overriddenSal Savage
System properties set with the "=" operator cannot be overriden. This device is used elsewhere in the system and some of the properties need to be overridden. The "?=" operator will use the assigned value if no other values are assigned elsewhere, allowing for overrides. Bug: 230638462 Test: adb shell getprop | grep bluetooth Merged-In: I29701f59e357d5896db5623493010be02dc2b4d5 Change-Id: I29701f59e357d5896db5623493010be02dc2b4d5
2022-04-26Update LE Audio profile properties to match spec and implementation am: ↵Sal Savage
2411804e2e Original change: https://android-review.googlesource.com/c/device/google/bonito/+/2073970 Change-Id: I8417b9d3fb6b3d3c09a92115c06fb4d7acfbe922 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22Update LE Audio profile properties to match spec and implementationSal Savage
Bug: 217448211 Test: atest BluetoothInstrumentationTests Merged-In: Id7cf86161037e805d1e1d50e314f6e40c6207897 Change-Id: Id7cf86161037e805d1e1d50e314f6e40c6207897
2022-04-18Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8433047" into stage-aosp-masterXin Li
2022-04-18Merge "Enable bluetooth profiles with product.prop" am: e7100c6487Sal Savage
Original change: https://android-review.googlesource.com/c/device/google/bonito/+/2062429 Change-Id: If2d9fb5fc6c2cafd2a0bf77f3b64601023df93f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18Merge sc-v2-dev-plus-aosp-without-vendor@8433047Xin Li
Bug: 226662282 Merged-In: I63bab0e7f4d2bd0b16531362ad25c09be2c89b8b Change-Id: I1694809fcc48a7b6b5c8523b386561f00216eaf0
2022-04-18Merge "Enable bluetooth profiles with product.prop"Sal Savage
2022-04-14Non-module targets. am: bb1c166526Bob Badour
Original change: https://android-review.googlesource.com/c/device/google/bonito/+/2063379 Change-Id: I60cc0332dfe8bf3a7bf97ab1cc0621189e26a808 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14[automerger skipped] Add new notice file build logic am: 47008b9538 -s oursBill Yi
am skip reason: Merged-In I9cadc3074a51d47d3babc6fe63cf91bc79d4bf31 with SHA-1 749e6717e6 is already in history Original change: https://android-review.googlesource.com/c/device/google/bonito/+/2064010 Change-Id: I3eb071450925ca6d93e698784ffe5905433fbec7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Non-module targets.Bob Badour
Bug: 151177513 Bug: 213388645 Bug: 210912771 Test: m droid dist reportmissinglicenses Change-Id: Ia5ee7f8de8e074636f115f5e247f793420f08e5b
2022-04-13Add new notice file build logicBill Yi
BUG: 223289891 Change-Id: I9cadc3074a51d47d3babc6fe63cf91bc79d4bf31 Merged-in: I9cadc3074a51d47d3babc6fe63cf91bc79d4bf31
2022-04-12Enable bluetooth profiles with product.propSal Savage
Bug: 217448211 Test: make -j Merged-In: Ie73064582e562c579c7985c857ccd2ee6ebd095b Change-Id: Ie73064582e562c579c7985c857ccd2ee6ebd095b
2022-04-08Merge changes from topic "presubmit-am-cdb750214e3d427e87222419a95f5abc" ↵TreeHugger Robot
into sc-v2-dev-plus-aosp * changes: [automerge] Update bonito SVN to 58 2p: e7091e0b92 Update bonito SVN to 58
2022-04-08[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: ↵Bill Yi
b41cb95f52 -s ours am: 91d4e4daf2 -s ours am skip reason: Merged-In I689d6e346643b7adedfe279091f0df4699292ac2 with SHA-1 c519e0cc01 is already in history Original change: https://android-review.googlesource.com/c/device/google/bonito/+/2059128 Change-Id: I890ba1e260eedb89bee6307fdfbb9e9f75dfded6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08[automerge] Update bonito SVN to 58 2p: e7091e0b92Steve Berbary
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bonito/+/17664163 Bug: 228616782 Change-Id: I18d861b5629038aea70d4db08c7965e25a8f3923
2022-04-08Update bonito SVN to 58Steve Berbary
Bug: 228616782 Change-Id: I63bab0e7f4d2bd0b16531362ad25c09be2c89b8b
2022-04-08[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: ↵Bill Yi
b41cb95f52 -s ours am skip reason: Merged-In I689d6e346643b7adedfe279091f0df4699292ac2 with SHA-1 c519e0cc01 is already in history Original change: https://android-review.googlesource.com/c/device/google/bonito/+/2059128 Change-Id: I50afae7f994bdb462fdf1e66ba007ca644e64198 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Merge SP2A.220405.004 to aosp-master - DO NOT MERGEBill Yi
Merged-In: I689d6e346643b7adedfe279091f0df4699292ac2 Merged-In: Icc41b7184f88a08796a7bec3cfe3c9590a2c31d4 Change-Id: Id00534576dcb7d1fe931da71074e1e6a25f1956b
2022-04-07Fixed status bar glitch for apps that access internal resource dimen am: ↵shawnlin
5e8b4f052c Original change: https://googleplex-android-review.googlesource.com/c/device/google/bonito/+/17535910 Change-Id: Icc41b7184f88a08796a7bec3cfe3c9590a2c31d4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: c519e0cc01 -s oursXin Li
am skip reason: Merged-In Ifb792a702123877571096a765744b73928247549 with SHA-1 d8c2409918 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/bonito/+/17545161 Change-Id: Ic4ce8f9a5269afc4dc324c0534934041f82d4133 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge Android 12 QPR3 ab/8391262Xin Li
Bug: 226662282 Merged-In: Ifb792a702123877571096a765744b73928247549 Change-Id: I689d6e346643b7adedfe279091f0df4699292ac2
2022-04-01Fixed status bar glitch for apps that access internal resource dimenshawnlin
Bring back old usage of status_bar_height, status_bar_height_portrait, and status_bar_height_landscape by set the size containing cutout size. Bug: 216782082 Test: make Change-Id: I8fc5916d6f6e57ebef538dc6ceee160d9c94b9ab
2022-04-01Merge "Non-module target." am: 29d27b8106 am: e7e03801eaTreehugger Robot
Original change: https://android-review.googlesource.com/c/device/google/bonito/+/2052131 Change-Id: Ide18628144fcbd4e6734db41d4ad27abe7b03261 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "Non-module target." am: 29d27b8106Treehugger Robot
Original change: https://android-review.googlesource.com/c/device/google/bonito/+/2052131 Change-Id: I1b1c0cd2598310fd39b9b3c235c2f5c5b679cda2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31Merge "Non-module target."Treehugger Robot
2022-03-31Non-module target.Bob Badour
Bug: 151177513 Bug: 213388645 Bug: 210912771 Test: m droid dist reportmissinglicenses Change-Id: I45a350d7f3b9e1808140b2e677e0bb15ea37cace
2022-03-30Revert "Migrate the blkio controller to the cgroup v2 hierarchy" am: ↵Bart Van Assche
efee2add8d am: f40d7061c2 Original change: https://android-review.googlesource.com/c/device/google/bonito/+/2049924 Change-Id: Ifb792a702123877571096a765744b73928247549 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30Revert "Migrate the blkio controller to the cgroup v2 hierarchy" am: efee2add8dBart Van Assche
Original change: https://android-review.googlesource.com/c/device/google/bonito/+/2049924 Change-Id: Icf8d63acc81dadaced74d796b80a7677309b1d4d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30Revert "Migrate the blkio controller to the cgroup v2 hierarchy"Bart Van Assche
Revert "Migrate the blkio controller to the cgroup v2 hierarchy" Revert submission 1962326-blkio-cgroup-v2 Reason for revert: This set of changes is suspected to have caused a redfin boot time regression for the git_tm-dev branch. Reverted Changes: Id18d876b6:Migrate the blkio controller to the cgroup v2 hier... I7dfa52136:Migrate the blkio controller to the v2 cgroup hier... I5336167be:Migrate the blkio controller to the cgroup v2 hier... I3f0131d8f:Migrate the blkio controller to the cgroup v2 hier... Ibb62b2d4d:Migrate the blkio controller to the cgroup v2 hier... Bug: 227382327 Change-Id: I2a0d8a45c10c00d4880daa8de2a6a2ce2e61134b
2022-03-29Migrate the blkio controller to the cgroup v2 hierarchy am: f5542dd837 am: ↵Bart Van Assche
ef5ecc3324 Original change: https://android-review.googlesource.com/c/device/google/bonito/+/1961880 Change-Id: I7aaea2878d8580e26d65c7c608d1383a2f3c3c45 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29Migrate the blkio controller to the cgroup v2 hierarchy am: f5542dd837Bart Van Assche
Original change: https://android-review.googlesource.com/c/device/google/bonito/+/1961880 Change-Id: I8f654c00e70c62759916e80f745f64419b8bd12d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-15Merge cherrypicks of [17113996] into sc-v2-release.android-12.1.0_r5Android Build Coastguard Worker
Change-Id: I07ed5791b84dc68993c5732fe1a9d475a58328e0
2022-03-15Update bonito SVN to 57Steve Berbary
Bug: 223313197 Change-Id: Ic2ed06886679671a04a35f86665cb147b8103905 (cherry picked from commit 2f02dcb4ff3050f1e3af11efa3ed809405e996d8) Merged-In: Ic2ed06886679671a04a35f86665cb147b8103905
2022-03-11Merge changes from topic "presubmit-am-aa763c85ba4e4c808990bf5ccb7b2245" ↵TreeHugger Robot
into sc-v2-dev-plus-aosp * changes: [automerge] Update bonito SVN to 57 2p: 2f02dcb4ff Update bonito SVN to 57 Bug: 223313197
2022-03-10Migrate the blkio controller to the cgroup v2 hierarchyBart Van Assche
Remove the statements from init.hardware.rc that refer to /dev/blkio since that path is only valid for the v1 cgroup hierarchy. Move the device settings into task_profiles.json. Bug: 213617178 Test: Untested. Change-Id: Ibb62b2d4d8026ab127edd402b4cfb8070327a568 Signed-off-by: Bart Van Assche <bvanassche@google.com>
2022-03-08Add new notice file build logicBill Yi
BUG: 223289891 Change-Id: I9cadc3074a51d47d3babc6fe63cf91bc79d4bf31
2022-03-08[automerger skipped] Merge Android 12L am: 0d7ebc836b -s ours am: 24519c6527 ↵Xin Li
-s ours am skip reason: Merged-In I0ec235d8980a0be04a7ee9d02ac507d757dcd896 with SHA-1 46e06696b5 is already in history Original change: https://android-review.googlesource.com/c/device/google/bonito/+/2011691 Change-Id: I1a2137f96d5d69a7d629b940b523242e1b3f874b
2022-03-08[automerger skipped] Merge Android 12L am: 0d7ebc836b -s oursXin Li
am skip reason: Merged-In I0ec235d8980a0be04a7ee9d02ac507d757dcd896 with SHA-1 46e06696b5 is already in history Original change: https://android-review.googlesource.com/c/device/google/bonito/+/2011691 Change-Id: I62ef7b02fbb127ef42ca026d4cf850433183e558
2022-03-08[automerge] Update bonito SVN to 57 2p: 2f02dcb4ffPresubmit Automerger Backend
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bonito/+/17113996 Bug: 223313197 Change-Id: Id5fe75f616710ad0b9f53e1950bd97c7245f7705
2022-03-08Update bonito SVN to 57Steve Berbary
Bug: 223313197 Change-Id: Ic2ed06886679671a04a35f86665cb147b8103905
2022-03-08Merge Android 12LXin Li
Bug: 222710654 Merged-In: I0ec235d8980a0be04a7ee9d02ac507d757dcd896 Change-Id: I1a2ccb5dbe1e6b5302a8dbda680459b1432085fb
2022-03-04Move comment to license_note am: 600cce0ef3 am: 46e06696b5Bob Badour
Original change: https://android-review.googlesource.com/c/device/google/bonito/+/2007797 Change-Id: I68867634dc1d382f3d7214775f376db6c3f43d27