Commit graph

2961 commits

Author SHA1 Message Date
Roshan Pius
1c66031b9e Merge "bluejay: Replace NFC app with NFC apex" into main 2023-10-16 18:31:03 +00:00
Lokesh Kumar Goel
3c9c537363 Update bluejay SVN to 50 am: 9b309d763a am: 10346ce553
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24895526

Change-Id: I38be00002a317c2631383ff4cf69248798ba22f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 05:35:26 +00:00
Lokesh Kumar Goel
10346ce553 Update bluejay SVN to 50 am: 9b309d763a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24895526

Change-Id: Id4737296e1311fac016e08350c1ca0201ee8c891
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 05:04:26 +00:00
Roshan Pius
f67025292b bluejay: Replace NFC app with NFC apex
Bug: 303286040
Test: Compiles
Merged-In: Ief6317a97f4c0208e506afc17ed6ab37e81d2db1
Change-Id: Ief6317a97f4c0208e506afc17ed6ab37e81d2db1
2023-10-13 18:03:57 +00:00
Guibing Cai
67a3395370 Merge "powerhint: bluejay: update vendor_sched procfs paths" into main 2023-10-13 17:19:11 +00:00
guibing
5f5a34609b powerhint: bluejay: update vendor_sched procfs paths
Vendor sched procfs path hierarchy gets updated in kernel.
Update the paths in powerhint json file to match the change.

Bug: 289151587
Test: Uibench ab test
Change-Id: I08b099b8267a8744ec50175d3284fb48a404c285
2023-10-11 23:57:35 +00:00
Roshan Pius
168fe64455 bluejay: Replace NFC app with NFC apex
Bug: 303286040
Test: Compiles
(cherry picked from https://android-review.googlesource.com/q/commit:f09150e453cbc609d1d45a72fabb3eb8bff6bba1)
Merged-In: Ief6317a97f4c0208e506afc17ed6ab37e81d2db1
Change-Id: Ief6317a97f4c0208e506afc17ed6ab37e81d2db1
2023-10-09 19:56:02 +00:00
Xin Li
e7b465184b [automerger skipped] Merge Android 14 am: 5014853167 -s ours am: 533241dbc7 -s ours am: 9932fc5ef1 -s ours am: 3d9832070b -s ours am: b621985731 -s ours
am skip reason: Merged-In Iee0db5d439442fe7c689aaecfa214ea90dbe76b4 with SHA-1 54a353165c is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/2776401

Change-Id: Ic9d21331812a576ee81b94d32465b534c1209bd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07 00:20:03 +00:00
Xin Li
70cccd6310 [automerger skipped] Merge Android 14 am: 27a7db0162 -s ours am: b99740f973 -s ours am: 53d5d3e010 -s ours am: 5144fcfb74 -s ours am: 2c840cedbf -s ours
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 0ea630f587 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2775835

Change-Id: I55b7b127458cd9be84243c05c6e92c2b0cc0bef9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07 00:19:52 +00:00
Xin Li
b621985731 [automerger skipped] Merge Android 14 am: 5014853167 -s ours am: 533241dbc7 -s ours am: 9932fc5ef1 -s ours am: 3d9832070b -s ours
am skip reason: Merged-In Iee0db5d439442fe7c689aaecfa214ea90dbe76b4 with SHA-1 54a353165c is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/2776401

Change-Id: I9356b4a7581fd56e0905e2e69f93bc41cb1ac3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 11:00:33 +00:00
Xin Li
2c840cedbf [automerger skipped] Merge Android 14 am: 27a7db0162 -s ours am: b99740f973 -s ours am: 53d5d3e010 -s ours am: 5144fcfb74 -s ours
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 0ea630f587 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2775835

Change-Id: I21193dd2a51d86c0c5ed04d48c188f906557be7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 11:00:21 +00:00
Xin Li
3d9832070b [automerger skipped] Merge Android 14 am: 5014853167 -s ours am: 533241dbc7 -s ours am: 9932fc5ef1 -s ours
am skip reason: Merged-In Iee0db5d439442fe7c689aaecfa214ea90dbe76b4 with SHA-1 54a353165c is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/2776401

Change-Id: Iee6d4902d5ae737a4f03d17f5a842187fdedaacf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:50:42 +00:00
Xin Li
5144fcfb74 [automerger skipped] Merge Android 14 am: 27a7db0162 -s ours am: b99740f973 -s ours am: 53d5d3e010 -s ours
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 0ea630f587 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2775835

Change-Id: I4d0f567451d80160a5db8595f2e9151393bfdda9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:50:31 +00:00
Xin Li
9932fc5ef1 [automerger skipped] Merge Android 14 am: 5014853167 -s ours am: 533241dbc7 -s ours
am skip reason: Merged-In Iee0db5d439442fe7c689aaecfa214ea90dbe76b4 with SHA-1 54a353165c is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/2776401

Change-Id: I2e3756fa1b0690963fd5c9bcd86b0aeb5cd6c71b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:59:08 +00:00
Xin Li
53d5d3e010 [automerger skipped] Merge Android 14 am: 27a7db0162 -s ours am: b99740f973 -s ours
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 0ea630f587 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2775835

Change-Id: Iaf4888b74fd9817762fe4cf0d3b3d372c8affd9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:58:56 +00:00
Xin Li
533241dbc7 [automerger skipped] Merge Android 14 am: 5014853167 -s ours
am skip reason: Merged-In Iee0db5d439442fe7c689aaecfa214ea90dbe76b4 with SHA-1 54a353165c is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay-sepolicy/+/2776401

Change-Id: If26733c497a61f2d165057ee18d4c3f18c228149
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:52:02 +00:00
Xin Li
b99740f973 [automerger skipped] Merge Android 14 am: 27a7db0162 -s ours
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 0ea630f587 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2775835

Change-Id: I7882c11a29328f5077626b90364f28562b969df2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:51:50 +00:00
Xin Li
5014853167 Merge Android 14
Bug: 298295554
Merged-In: Iee0db5d439442fe7c689aaecfa214ea90dbe76b4
Change-Id: I9bcfbd23f304c84d197383c4a294cce2fc1dc358
2023-10-05 15:32:49 -07:00
Xin Li
27a7db0162 Merge Android 14
Bug: 298295554
Merged-In: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
Change-Id: I9a5965085ad017c52637497f38e34100e039c8cd
2023-10-05 15:32:08 -07:00
ClintChen
fbf46c398a b3: Enable build flag versioning for radio and bootloader
Bug: 301142125
Change-Id: I665ab708541ca3b6d027daa3cf66ed66d211242b
2023-10-04 09:26:52 +00:00
Jimmy Shiu
722fc7d417 Merge "powerhint: Add DISPLAY_CHANGE hint" into main 2023-10-03 14:57:44 +00:00
Will McVicker
37bba82cfb Move haptics sepolicy to gs101-sepolicy
The i2c-7/7-0043 label is shared with both i2c-7/i2c-cs40l25a and
i2c-7/i2c-cs40l26a nodes. To make it clear that these all are related,
let's move i2c-7/i2c-cs40l26a to gs101-sepolicy and have all the gs101
vibrator policy labels together.

Test: build on b3 and verify i2c nodes on r4
Bug: 291606723
Change-Id: I58be5961120c0ec5597a947c5ab6caa52aeb7bce
2023-09-29 09:16:22 -07:00
Xin Li
3037971877 [automerger skipped] Merge UP1A.231005.007 am: 856bb61b7d -s ours am: a3e430e4e4 -s ours am: 02f8503d75 -s ours am: d37e5b4997 -s ours
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 d0c9858ecd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24879335

Change-Id: Ia6db7b2539aeb8118fc482334867499f23202e0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 10:20:35 +00:00
Xin Li
d37e5b4997 [automerger skipped] Merge UP1A.231005.007 am: 856bb61b7d -s ours am: a3e430e4e4 -s ours am: 02f8503d75 -s ours
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 d0c9858ecd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24879335

Change-Id: I8c9d882b30602d25257dbc775dcc7dd80d86ac86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 09:04:35 +00:00
Xin Li
02f8503d75 [automerger skipped] Merge UP1A.231005.007 am: 856bb61b7d -s ours am: a3e430e4e4 -s ours
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 d0c9858ecd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24879335

Change-Id: I8fb5873e56341a2de110c601454e3377a9b0852d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 08:16:32 +00:00
Xin Li
a3e430e4e4 [automerger skipped] Merge UP1A.231005.007 am: 856bb61b7d -s ours
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 d0c9858ecd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24879335

Change-Id: I0ef2a99b0d9876400a0c992206a19f54ce99a738
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 07:15:42 +00:00
Lokesh Kumar Goel
be1d0f6c38 Update bluejay SVN to 51
Bug: 302612466
Change-Id: If8f16626a5e13f98e81ff0833a60888efe9cddcd
2023-09-29 01:15:32 +00:00
Lokesh Kumar Goel
9b309d763a Update bluejay SVN to 50
Bug: 302612466
Change-Id: I7393253ef50c9b1da0f683ffcdd9cd191c8ab1f6
2023-09-29 01:13:58 +00:00
Roy Luo
5e130ea7c3 Revert "Update the cs40l26a i2c device node sepolicy labeling"
Revert submission 24855741-gs101-i2c-bus-fixes

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.corp.google.com/builds/quarterdeck?branch=git_main&target=bluejay-trunk_food-userdebug&lkgb=10876543&lkbb=10876988&fkbb=10876587, bug b/302549624.

Reverted changes: /q/submissionid:24855741-gs101-i2c-bus-fixes

Change-Id: I1450fd464d661edbb7b3dc45bccc46f1e4d3a4bc
BUG: 302549624
2023-09-28 18:00:06 +00:00
Maciej Żenczykowski
5325728bfc OWNERS: master -> main
Change-Id: I27239c7c754c1c58b72e4c24e782119364617f42
2023-09-28 00:29:21 +00:00
Xin Li
856bb61b7d Merge UP1A.231005.007
Bug: 291102124
Merged-In: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
Change-Id: I2082f1cf1b4b9e607ff710b223552f66babbb122
2023-09-27 16:04:11 -07:00
Jimmy Shiu
b0730273ad powerhint: Add DISPLAY_CHANGE hint
Add DISPLAY_CHANGE hint for display layout change due to rotation or
switching between inner and outer panels.

Bug: 298150450
Test: build pass
Change-Id: I397334d53c89b65af54e91455b76f0036754738e
2023-09-23 12:25:20 +08:00
Android Build Coastguard Worker
60c02ea00e Snap for 10832001 from dba182188e to udc-qpr1-release
Change-Id: I63c1d4d3e3ff10bb11440a82607a6043279b69ba
2023-09-19 23:02:25 +00:00
Rick Yiu
e8ac435fd9 Disable limiting camera_hal for LAUNCH hint am: dba182188e am: ab6c5825c6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24798149

Change-Id: Iec4f2516dffaa606a8f33863e6e5f97d3bda315c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 08:03:26 +00:00
Rick Yiu
ab6c5825c6 Disable limiting camera_hal for LAUNCH hint am: dba182188e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24798149

Change-Id: I7a35549201eaa230c65cfef3b3d15985ba130a76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 07:57:37 +00:00
Rick Yiu
dba182188e Disable limiting camera_hal for LAUNCH hint
If auto rotation is enabled, it will trigger LAUNCH hint while
camera is running if device rotates, which could limit camera_hal
tasks to little cores. So, disable it first until there is a new
hint for the rotation event.

Bug: 297273578
Test: build pass
Change-Id: Ib92bb1ee5833924a1e34b8c91e15f6cb26a0e645
2023-09-19 03:04:17 +00:00
Will McVicker
ccdd975a88 Update the cs40l26a i2c device node sepolicy labeling
This change needs to be merged with the corresponding kernel change that
sets the i2c bus aliases correctly to match the existing v5.10 bus
probe ordering.

To verify the sepolicy labeling doesn't change, run the below commands
and diff the stdout on builds with and without the changes. For extra
credit, verify the nodes are labeled the same when upgrading the kernel
to v6.1 (with the correct i2c aliases to match the existing policy):

  acpm_bus_array=("acpm_mfd_bus@17500000" "acpm_mfd_bus@17510000")
  for bus in ${acpm_bus_array[@]}; do
    adb shell ls -ZR /sys/devices/platform/${bus}/i2c-*;
  done

  bus_array=("10960000" "10970000" "10d50000" "10900000")
  for bus in ${bus_array[@]}; do
    adb shell ls -ZR /sys/devices/platform/${bus}.hsi2c/i2c-*;
  done

Test: verify on b3
Bug: 291606723
Change-Id: I36e41d7e2379b731c2092a679dc4e4042e0d3651
2023-09-18 15:37:54 -07:00
Desmond Huang
7595c2dae8 Relocate common tracking denial entries
Bug: 299029620
Change-Id: I15c42b09239e2c59b1a8d505f03fba260257d475
2023-09-14 14:13:19 +08:00
Android Build Coastguard Worker
1a15d43373 Snap for 10804332 from eb91bc0b4a to udc-qpr1-release
Change-Id: I8000cc50293c66f6f70199746bfba57f32faf2a3
2023-09-13 23:01:52 +00:00
Treehugger Robot
9de9e84de4 Merge "Revert "DeviceAsWebcam: Add overlays for physical camera id"" into udc-qpr-dev am: eb91bc0b4a am: 16f80d40da
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24737613

Change-Id: I72fc433b00372f01a1b2f9fe1580873474952775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 03:00:52 +00:00
Treehugger Robot
16f80d40da Merge "Revert "DeviceAsWebcam: Add overlays for physical camera id"" into udc-qpr-dev am: eb91bc0b4a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24737613

Change-Id: Ic0c7d735bac036e5493f640ba742e10c79f594a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 02:09:15 +00:00
Treehugger Robot
eb91bc0b4a Merge "Revert "DeviceAsWebcam: Add overlays for physical camera id"" into udc-qpr-dev 2023-09-13 01:38:44 +00:00
Jayant Chowdhary
c1f4f50bd0 Revert "DeviceAsWebcam: Add overlays for physical camera id"
This reverts commit 89f99fd401.

Reason for revert: With stream use case VIDEO_CALL + logical stream power is well within the permissible limit of 3W.

Bug: 300166920

Change-Id: I2d764fdf2dc3124d3f60513c5e76108b52ed8f7b
2023-09-12 23:46:56 +00:00
Android Build Coastguard Worker
864f7e2d26 Snap for 10791906 from 3b21269752 to udc-qpr1-release
Change-Id: I79a85229b555184caf4d27e4761d86f978179ede
2023-09-11 23:01:45 +00:00
Ankur Bakshi
e381733600 Update bluejay SVN to 49 am: b2ee8ab0f5 am: 1b579be017 am: 3b21269752 am: ba13ce4d9b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24697428

Change-Id: I453a9ca1211ba7e6f7070183d8da6ed2fde2eb5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 21:37:46 +00:00
Ankur Bakshi
9f36532260 Update bluejay SVN to 48 am: d293f75732 am: 6d04514bb1 am: 29e278a0d1 am: 701b728c8d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24686398

Change-Id: Ib0020ed37525cf02700905125304d304dc854a7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 21:37:44 +00:00
Ankur Bakshi
539664074f Update bluejay SVN to 49 am: b2ee8ab0f5 am: 37e2228f47 am: 75ac2a1f9a am: 0c15e70f7a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24697428

Change-Id: I529173c90965869a2cb540aa49db1666bcb5199c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 21:33:00 +00:00
Ankur Bakshi
18352fd9df Update bluejay SVN to 48 am: d293f75732 am: 83bd8adfb0 am: 896efaa41b am: 9fc2e765bd
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24686398

Change-Id: I6e054f25686a7847f762c52c2b4e4b66a75e9727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 21:32:58 +00:00
Ankur Bakshi
c2ac5255c6 Update bluejay SVN to 49 am: b2ee8ab0f5 am: 1b579be017 am: 5b344c9b98 am: 50e711ad53
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24697428

Change-Id: I84e720412f3c565dbd38f58024bc41784e92e95b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 21:21:36 +00:00
Ankur Bakshi
e643baf481 Update bluejay SVN to 48 am: d293f75732 am: 6d04514bb1 am: d6931427b1 am: b682178dad
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24686398

Change-Id: I1a90e8663e5c94745a1240c47d03ad093f507a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 21:21:30 +00:00