Evgenii Stepanov
4ffd2f95c5
Merge changes I9311210f,Ic42cc810,I42781e8e into udc-d1-dev am: 7421288b2d
am: ac6e7b6bed
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23700251
Change-Id: I1a4809b4814d1e57b117682e4e6fbfc82b830685
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 00:55:46 +00:00
Evgenii Stepanov
586d75fa60
Merge changes I9311210f,Ic42cc810,I42781e8e into udc-d1-dev am: 7421288b2d
am: 645e0ea8d2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23700251
Change-Id: I0491f8394be7eb7d2e3243372011760b8b71e8dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 00:52:46 +00:00
Evgenii Stepanov
ac6e7b6bed
Merge changes I9311210f,Ic42cc810,I42781e8e into udc-d1-dev am: 7421288b2d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23700251
Change-Id: I18768922de8c568bb411c548c46360655598f834
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 00:06:54 +00:00
Evgenii Stepanov
645e0ea8d2
Merge changes I9311210f,Ic42cc810,I42781e8e into udc-d1-dev am: 7421288b2d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23700251
Change-Id: I063d0ef503c4cd7ccd3aecfbaffc4b2323ad864b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 00:05:28 +00:00
Evgenii Stepanov
7421288b2d
Merge changes I9311210f,Ic42cc810,I42781e8e into udc-d1-dev
...
* changes:
Zuma: disable MTE on system apps
[Zuma] Unset mte_tcf_preferred
Disable Kernel MTE in Zuma (non-fullmte).
2023-06-15 23:33:20 +00:00
Chi Zhang
26373aa5d5
Fix OobConfig permission for zuma. am: 0af09e0dc8
am: 174d7fc720
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23701150
Change-Id: Iea173cc7af9ffedc2c673f3cde9e3dcebcd3f342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 18:53:57 +00:00
Chi Zhang
2c1c6afba8
Fix OobConfig permission for zuma. am: 0af09e0dc8
am: ea2d59555e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23701150
Change-Id: Ied94fc7904eda6fde66e8edd850861bd0de185a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 18:48:09 +00:00
Chi Zhang
174d7fc720
Fix OobConfig permission for zuma. am: 0af09e0dc8
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23701150
Change-Id: Ica58e896b75628218470e65403792d08b8c7a6d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 18:05:40 +00:00
Chi Zhang
ea2d59555e
Fix OobConfig permission for zuma. am: 0af09e0dc8
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23701150
Change-Id: I35c56a078ad88b742be48086d9b0139a11a2d8f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 18:03:24 +00:00
Jack Wu
e860ed7912
Set current date as activation date after device being provisioned am: 3e3eecbbec
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23705450
Change-Id: I35887ed33820e4d6261212266056e2cd43bf1b48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 12:10:43 +00:00
Jack Wu
3e3eecbbec
Set current date as activation date after device being provisioned
...
allow setting it when the device is unlocked.
Bug: 286767821
Test: set the date of first usage successfully
Change-Id: I2c4d21662e88a9d8d2b857547d12825575a81331
Signed-off-by: Jack Wu <wjack@google.com>
2023-06-15 08:40:31 +00:00
Chi Zhang
0af09e0dc8
Fix OobConfig permission for zuma.
...
Bug: 286117997
Test: build and manual test
Change-Id: I51f3a63b337ea555cc52ba71d776f5d0993409fd
2023-06-14 18:18:47 -07:00
Evgenii Stepanov
e205724019
Zuma: disable MTE on system apps
...
Bug: 280343521
Test: debuggerd on the listed apps should not mention PR_TCF_MTE
Change-Id: I9311210fec4e6f720fb2a7c4d48c4927925d252b
2023-06-14 17:17:12 -07:00
Evgenii Stepanov
bc502d582b
[Zuma] Unset mte_tcf_preferred
...
Reverting to all-async configuration according to PoR.
Bug: 280343521
Test: adb shell setprop persist.device_config.runtime_native_boot.bootloader_override force_on
adb reboot
adb shell 'cat /sys/devices/system/cpu/cpu?/mte_tcf_preferred'
should return all "async"
Change-Id: Ic42cc8102ff55348dd9061682a779d9dde6ee02c
2023-06-14 15:47:33 -07:00
Darren Hsu
c725bbf729
power: update sysfs path for NFC state residency am: 88a5bd2684
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23662311
Change-Id: I126d008f4e6043674761b91d9952fcb30769eac4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 11:50:18 +00:00
Darren Hsu
88a5bd2684
power: update sysfs path for NFC state residency
...
Bug: 270498656
Test: run singleCommand pts -l verbose -m PtsPowerTestCases
Change-Id: I491335c052de363c422ede7a3fb49d5a164a0d7c
Signed-off-by: Darren Hsu <darrenhsu@google.com>
2023-06-14 11:57:09 +08:00
Evgenii Stepanov
3fefb2e823
Disable Kernel MTE in Zuma (non-fullmte).
...
Bug: 280343521
Test: cat /proc/cmdline | grep kasan=off
Change-Id: I42781e8efdc4cf5a89baca1af8c3d62a4984c4f2
2023-06-13 15:30:05 -07:00
Quinn Yan
dbec36b876
Merge "Increase the com.google.edgetpu.dba service version to 2 in the framework matrix xml." into udc-d1-dev am: 24d4e59415
am: a3a67e0bb8
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23604492
Change-Id: I031b710faf5fa99f632b4ac6a17e15a944f85cbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 17:47:21 +00:00
Hiroshi Akiyama
0ef47fa82e
Merge "zuma: Update GPU and TPU heavy and light clock div ratios" into udc-d1-dev am: f3178662c2
am: 07a66fc6c2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23605770
Change-Id: Ic15ade0b759fef0e6be6d8977f18ed0653c8b5c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 17:47:11 +00:00
Quinn Yan
d97ab78dbb
Merge "Increase the com.google.edgetpu.dba service version to 2 in the framework matrix xml." into udc-d1-dev am: 24d4e59415
am: fa4e0d4781
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23604492
Change-Id: I60d54695419f9d8683aae43242c163e2047f165c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 17:44:26 +00:00
Hiroshi Akiyama
94c52e8763
Merge "zuma: Update GPU and TPU heavy and light clock div ratios" into udc-d1-dev am: f3178662c2
am: 3cb50444bf
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23605770
Change-Id: I7c8f1b1687400b0585ebf42cc7a83a8b7e5057ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 17:44:07 +00:00
Quinn Yan
a3a67e0bb8
Merge "Increase the com.google.edgetpu.dba service version to 2 in the framework matrix xml." into udc-d1-dev am: 24d4e59415
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23604492
Change-Id: I953710303c2bb5df4c968ed20626b047415179b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 17:21:31 +00:00
Quinn Yan
fa4e0d4781
Merge "Increase the com.google.edgetpu.dba service version to 2 in the framework matrix xml." into udc-d1-dev am: 24d4e59415
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23604492
Change-Id: I53b65ac78ae266b193fbd9f40221d9ac9c874ace
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 17:19:20 +00:00
Quinn Yan
24d4e59415
Merge "Increase the com.google.edgetpu.dba service version to 2 in the framework matrix xml." into udc-d1-dev
2023-06-12 17:01:37 +00:00
Hiroshi Akiyama
07a66fc6c2
Merge "zuma: Update GPU and TPU heavy and light clock div ratios" into udc-d1-dev am: f3178662c2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23605770
Change-Id: I10a7dadb731eb951b70ca9e7866beeb22d3f2ddb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 17:01:06 +00:00
Hiroshi Akiyama
3cb50444bf
Merge "zuma: Update GPU and TPU heavy and light clock div ratios" into udc-d1-dev am: f3178662c2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23605770
Change-Id: I537b0070a8b37b8acac6edbb8feb1baa4253f81e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 16:56:55 +00:00
Hiroshi Akiyama
f3178662c2
Merge "zuma: Update GPU and TPU heavy and light clock div ratios" into udc-d1-dev
2023-06-12 16:19:28 +00:00
Joey Poomarin Phloyphisut
c558023d67
Merge "pixelstats: add adapted_info sysfs for VendorAudioAdaptedInfoStatsReported" into udc-d1-dev am: 7129ab355d
am: b941559785
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23126128
Change-Id: Idbd40130858c219a4399d46b48972ba331476411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 16:18:08 +00:00
Joey Poomarin Phloyphisut
1de02e830d
Merge "pixelstats: add adapted_info sysfs for VendorAudioAdaptedInfoStatsReported" into udc-d1-dev am: 7129ab355d
am: e73533c864
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23126128
Change-Id: I40f22867e22111790c4d62a8e6ded3ec2857cb27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 16:12:16 +00:00
Joey Poomarin Phloyphisut
b941559785
Merge "pixelstats: add adapted_info sysfs for VendorAudioAdaptedInfoStatsReported" into udc-d1-dev am: 7129ab355d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23126128
Change-Id: If87b6fe4ab476907831edf3e9129db532785c254
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 15:30:03 +00:00
Joey Poomarin Phloyphisut
e73533c864
Merge "pixelstats: add adapted_info sysfs for VendorAudioAdaptedInfoStatsReported" into udc-d1-dev am: 7129ab355d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23126128
Change-Id: I9039a2bf88de0737f36b1dead422646b1b1c868e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 15:26:02 +00:00
Joey Poomarin Phloyphisut
7129ab355d
Merge "pixelstats: add adapted_info sysfs for VendorAudioAdaptedInfoStatsReported" into udc-d1-dev
2023-06-09 14:44:34 +00:00
Petri Gynther
279ee184c6
Merge "usb: dp: add exynos_drm:dp_enabled toggling" into udc-d1-dev am: 5b7898c3b4
am: 35aed29fdf
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23624743
Change-Id: I95967c10744a76291bc40792b8fead9d6e61b899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 06:55:21 +00:00
Petri Gynther
b5b24b5247
Merge "usb: dp: add exynos_drm:dp_enabled toggling" into udc-d1-dev am: 5b7898c3b4
am: d20da7fbf4
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23624743
Change-Id: I82b208a2ce61e001598cfe054a266d3de699325b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 06:49:24 +00:00
Petri Gynther
35aed29fdf
Merge "usb: dp: add exynos_drm:dp_enabled toggling" into udc-d1-dev am: 5b7898c3b4
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23624743
Change-Id: Ic940962192cec3c58a7130f65aec586bb9dab3ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 06:10:29 +00:00
Petri Gynther
d20da7fbf4
Merge "usb: dp: add exynos_drm:dp_enabled toggling" into udc-d1-dev am: 5b7898c3b4
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23624743
Change-Id: I2c4d2fc078241821caf129e8ab1e637800670e36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 06:06:25 +00:00
Petri Gynther
5b7898c3b4
Merge "usb: dp: add exynos_drm:dp_enabled toggling" into udc-d1-dev
2023-06-09 05:28:28 +00:00
Petri Gynther
c8abdf6bb7
usb: dp: add exynos_drm:dp_enabled toggling
...
Bug: 286459987
Change-Id: If4a6e71bc3ce342af8a0201b4727bdc4666cf8f0
2023-06-08 18:02:44 -07:00
Treehugger Robot
a89e740330
Merge "Add uevent rule for gcma_camera dmaheap nodes" into udc-d1-dev am: 38044255b1
am: 8c57941b23
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22313084
Change-Id: I5e033c033a0d1ca7b6a46e1e32508752c0aaf9b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 08:10:01 +00:00
Treehugger Robot
9c8073f92f
Merge "Add uevent rule for gcma_camera dmaheap nodes" into udc-d1-dev am: 38044255b1
am: 926fadb211
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22313084
Change-Id: I4adfc7f920396d0cdbd852fa7d2c58bd4ed76029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 08:04:24 +00:00
Treehugger Robot
8c57941b23
Merge "Add uevent rule for gcma_camera dmaheap nodes" into udc-d1-dev am: 38044255b1
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22313084
Change-Id: Icc5a38aa5bdcbcd3dae342b1a7be3c1030dea81d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 07:22:34 +00:00
Treehugger Robot
926fadb211
Merge "Add uevent rule for gcma_camera dmaheap nodes" into udc-d1-dev am: 38044255b1
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22313084
Change-Id: Ia81121695e93b23a6cc16d9c7b2a0710e784c799
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 07:21:08 +00:00
Treehugger Robot
38044255b1
Merge "Add uevent rule for gcma_camera dmaheap nodes" into udc-d1-dev
2023-06-08 06:25:44 +00:00
Poomarin Phloyphisut
430fcc51de
pixelstats: add adapted_info sysfs for VendorAudioAdaptedInfoStatsReported
...
Bug: 280248702, 280248995
Test: Local Test
Change-Id: I8e56455cab735a8300892184567fe052a27375ed
2023-06-08 05:51:28 +00:00
Kelly Rossmoyer
52100f5d61
Merge "suspend: enable adaptive suspend" into udc-d1-dev am: 39e92da0f5
am: e8a2362c37
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23604035
Change-Id: I3395d53d9aa5acfb81f3b363efc066821877c7dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 05:15:26 +00:00
Joey Poomarin Phloyphisut
b9b0e76acd
Merge "pixelstats: add waves sysfs for VendorAudioThirdPartyEffectStatsReported" into udc-d1-dev am: c95125c1a7
am: 307c347d11
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23126122
Change-Id: I2da3be55b50728a007a70d8a35205f9c23e4fad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 05:15:13 +00:00
Kelly Rossmoyer
ec6ccb8234
Merge "suspend: enable adaptive suspend" into udc-d1-dev am: 39e92da0f5
am: d352b5dda0
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23604035
Change-Id: I5550cb7b96005d38b42701f6c696a8463695fdc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 05:12:20 +00:00
Joey Poomarin Phloyphisut
90592cbbdc
Merge "pixelstats: add waves sysfs for VendorAudioThirdPartyEffectStatsReported" into udc-d1-dev am: c95125c1a7
am: e91c998e7b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23126122
Change-Id: I40c257df6c25a62c40d3662f9dc64ecd96228d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 04:50:07 +00:00
Kelly Rossmoyer
e8a2362c37
Merge "suspend: enable adaptive suspend" into udc-d1-dev am: 39e92da0f5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23604035
Change-Id: Ib953204cbf6ff30ed7c39e0220a2b2bbde4f7a78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 04:30:35 +00:00
Joey Poomarin Phloyphisut
307c347d11
Merge "pixelstats: add waves sysfs for VendorAudioThirdPartyEffectStatsReported" into udc-d1-dev am: c95125c1a7
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23126122
Change-Id: I9c3eecd45ffcaa76f011fe98e5aba7621f83a2d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 04:30:15 +00:00