Commit graph

1233 commits

Author SHA1 Message Date
Wilson Sung
9993923a00 Remove unused trace_marker am: 5f4c896e1c am: fe5796a125
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23737615

Change-Id: I25fd56f1b6f33204cf267ef44428995158a8b33f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 05:46:38 +00:00
Wilson Sung
a4542b3262 Remove unused trace_marker am: 5f4c896e1c am: 2e7aab883d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23737615

Change-Id: If3314459e5a8de86448ebabdf37cba2dedf818e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 05:40:41 +00:00
Wilson Sung
fe5796a125 Remove unused trace_marker am: 5f4c896e1c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23737615

Change-Id: I452c357f43408cc75a6847f8171102703ece7dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 05:02:16 +00:00
Wilson Sung
2e7aab883d Remove unused trace_marker am: 5f4c896e1c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23737615

Change-Id: I8c3e6fcff26f3737f7ff8f4c1e7fa083754104ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 04:58:08 +00:00
Badhri Jagan Sridharan
533b9f2f88 Merge changes I1707970c,Iddb0921b into udc-qpr-dev am: 3d0153662a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23717645

Change-Id: I9ea9610ef10c15a33539745ad572886687b89127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 20:26:43 +00:00
Badhri Jagan Sridharan
3d0153662a Merge changes I1707970c,Iddb0921b into udc-qpr-dev
* changes:
  Usb: shutdown old displayport poll thread when multiple start up
  Usb: Check for displayport when booting
2023-06-20 19:37:42 +00:00
Wilson Sung
5f4c896e1c Remove unused trace_marker
Fix: 260366195
Change-Id: Ia9515d0df9f80bbb4008faa30ce38491d2f4e693
2023-06-20 14:32:29 +08:00
Evgenii Stepanov
971cc0c01b Merge "Disable MTE in system_server." into udc-d1-dev am: 2cb239bb20 am: d5f156f654
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23734636

Change-Id: I78f25cb47057a23f769837a79c92163ad6adb13b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 21:43:03 +00:00
Evgenii Stepanov
4a7fb0f311 Merge "Disable MTE in system_server." into udc-d1-dev am: 2cb239bb20 am: bc75d3c97e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23734636

Change-Id: I34f3c13ada45392845267fd5ac416edafab69a55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 21:37:38 +00:00
Evgenii Stepanov
d5f156f654 Merge "Disable MTE in system_server." into udc-d1-dev am: 2cb239bb20
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23734636

Change-Id: I12a1d90901ea75a41efb7640429b68e80961fa4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 20:57:32 +00:00
Evgenii Stepanov
bc75d3c97e Merge "Disable MTE in system_server." into udc-d1-dev am: 2cb239bb20
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23734636

Change-Id: I6af66c3b475ae77098cb9157c33dc26feb07ec32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 20:53:39 +00:00
Evgenii Stepanov
2cb239bb20 Merge "Disable MTE in system_server." into udc-d1-dev 2023-06-19 20:19:18 +00:00
Joe Shih
aebf650353 Merge "[SEPolicy]Change to gs-common." into udc-d1-dev am: 778892fa33 am: 8d1204f9e4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23720968

Change-Id: I89fcff11e65dbaf8bd6fd8e9056155b30be0aff2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 07:50:35 +00:00
Joe Shih
5fd8c0dc2c Merge "[SEPolicy]Change to gs-common." into udc-d1-dev am: 778892fa33 am: f067b7d5b5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23720968

Change-Id: I8dfe887bf5b5c86c0015163640c2782b9e2c035d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 07:22:27 +00:00
Joe Shih
8d1204f9e4 Merge "[SEPolicy]Change to gs-common." into udc-d1-dev am: 778892fa33
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23720968

Change-Id: I121561f65b58882f7930098a5e300299561ea5d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 07:05:10 +00:00
Joe Shih
f067b7d5b5 Merge "[SEPolicy]Change to gs-common." into udc-d1-dev am: 778892fa33
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23720968

Change-Id: If99ef10c25fbbefbceb5c7663db9e14bd4ddcece
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 07:01:12 +00:00
Joe Shih
778892fa33 Merge "[SEPolicy]Change to gs-common." into udc-d1-dev 2023-06-19 06:21:20 +00:00
Treehugger Robot
a5285fb990 Merge "powerstats: update TPU energy consumer stats" into udc-d1-dev am: f5ac9c0c06 am: e42e4b3303
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23720969

Change-Id: I217cbf4828a59d5674b998dc34f18f6aeb8d8dde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 02:59:08 +00:00
Treehugger Robot
8b74f7db0b Merge "powerstats: update TPU energy consumer stats" into udc-d1-dev am: f5ac9c0c06 am: a0b7dad09a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23720969

Change-Id: I8c51cf485930d4e13575ca1f9318e3473a23cb07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 02:53:30 +00:00
Treehugger Robot
e42e4b3303 Merge "powerstats: update TPU energy consumer stats" into udc-d1-dev am: f5ac9c0c06
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23720969

Change-Id: I744f2cef780ce4c4b62e44d60de98beeb5ef64df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 02:13:15 +00:00
Treehugger Robot
a0b7dad09a Merge "powerstats: update TPU energy consumer stats" into udc-d1-dev am: f5ac9c0c06
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23720969

Change-Id: I057faf31ce01fbc14530fd4605e60112644c10c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 02:09:07 +00:00
Treehugger Robot
f5ac9c0c06 Merge "powerstats: update TPU energy consumer stats" into udc-d1-dev 2023-06-19 01:35:28 +00:00
joeshih
ec838e4c63 [SEPolicy]Change to gs-common.
Bug: 287167439
Test: Forrest build to verify pass.
Change-Id: Ib4350636c006c996c36bf36d13162e40d4f0f7ac
2023-06-17 16:50:43 +08:00
Evgenii Stepanov
02d739e388 Disable MTE in system_server.
Bug: 280343521
Test: debuggerd `pidof system_server` | head -30 | grep tagged_addr
      does not include PR_MTE_
Change-Id: I64e3cf43162c8ab39f45b37240e26c2f25ea964e
2023-06-16 16:55:02 -07:00
Rick Yiu
def5bc9031 Make bg group throttle value experimental am: c55210888a am: aea5707558
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23728143

Change-Id: Ie8ad720961a5d61fa04b081ddad253e096ee5a48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 18:03:30 +00:00
Rick Yiu
a8679a094e Make bg group throttle value experimental am: c55210888a am: 3176ebb6bd
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23728143

Change-Id: Id42d76397c73e8a105083552bf091b3552acdd76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 17:58:12 +00:00
Rick Yiu
aea5707558 Make bg group throttle value experimental am: c55210888a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23728143

Change-Id: Id4f46190f2f93de1d3651e0bfc331c8ad0b483f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 17:15:43 +00:00
Rick Yiu
3176ebb6bd Make bg group throttle value experimental am: c55210888a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23728143

Change-Id: Ieb10b40c9ec77b08cf7b22695a8be4cd12f1d80b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 17:12:28 +00:00
Rick Yiu
c55210888a Make bg group throttle value experimental
Bug: 287562715
Test: build pass
Change-Id: I5809b726ff5875db67e91df41f8ba172d84b10e3
2023-06-16 11:16:52 +00:00
Darren Hsu
30563b4268 powerstats: update TPU energy consumer stats
Bug: 253702169
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I24b846527432aa614534cffe637e306b83af1e81
Signed-off-by: Darren Hsu <darrenhsu@google.com>
2023-06-16 17:22:15 +08:00
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
RD Babiera
78f6294e38 Usb: shutdown old displayport poll thread when multiple start up
Better enforces that only one DisplayPort poll thread should be
active at once. If a new call to setup is made from additional
bind uevents before a disconnect occurs, tells the old thread
to shutdown and awaits signaling before a new worker thread spins
up.

Test: manual testing on device
Bug: 286593610
Change-Id: I1707970c500915fd4abb161d0b3a424bbb2bddca
2023-06-15 23:26:09 +00:00
Badhri Jagan Sridharan
574d046bd7 Usb: Check for displayport when booting
When booting check whether displayport driver has been probed and
signal hpd events as needed. Pin config and orientation needs to
be queried before signalling hpd.

Bug: 282223693
Change-Id: Iddb0921b363e49c41c0f6f635887b4daf4d19561
2023-06-15 23:23:01 +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