Commit graph

2747 commits

Author SHA1 Message Date
Shashwat Razdan
df92ac07bd Adding android.software.contextualsearch to zuma devices.
Bug: 326143814
Test: Built and tested on device
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3ceb5170ce03587387eaf794a4ee5d0c68540664)
Merged-In: I4ee1ecd9e292d6e1807ba1f77851e53380db0a07
Change-Id: I4ee1ecd9e292d6e1807ba1f77851e53380db0a07
CP feature CLs to 24d1-dev
2024-03-13 23:58:37 +00:00
Hongyang Jiao
593127ec47 Merge "Add betterbug.mk to zuma" into main 2024-03-13 04:30:07 +00:00
Spade Lee
a4b4967c03 pixelstats: zuma: add history validation path
Bug: 329174074
Change-Id: Ia134e6b6b8dc0c9db35bcf36bed700b67466f353
Signed-off-by: Spade Lee <spadelee@google.com>
2024-03-13 02:00:22 +00:00
Chungro Lee
c0f9207cf5 pixelstats: move learning/model load path to sysfs
Reporting learning(relaxation) and model loading once a day
 * learning and model loading path moved from uevent to
   sysfs collector.

Bug: 329124192
Change-Id: I91039ce3a8ee4630a76113ef7ae6be3bc6908f64
Signed-off-by: Chungro Lee <chungro@google.com>
2024-03-13 01:29:18 +00:00
Android Build Coastguard Worker
e361427f05 Merge cherrypicks of ['googleplex-android-review.googlesource.com/26450008'] into 24Q2-release.
Change-Id: I28ec471aba80fab9378bbf5835d92c2589496c09
2024-03-08 23:58:33 +00:00
Daniel Chapin
1e0c02c5de Revert "Add betterbug mk to zuma"
Revert submission 26348985-bb-sepolicy-poc

Reason for revert: Droidfood blocking bug: b/327991669

Bug: b/327991669

Reverted changes: /q/submissionid:26348985-bb-sepolicy-poc
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fe980182cc8f21d7af154271d58aff971f72132c)
Merged-In: I83de6f389e4ce5113afd751871e0e10e67fb0b4f
Change-Id: I83de6f389e4ce5113afd751871e0e10e67fb0b4f
2024-03-08 23:54:55 +00:00
Android Build Coastguard Worker
8a9faf7829 Merge cherrypicks of ['googleplex-android-review.googlesource.com/26469535'] into 24Q2-release.
Change-Id: I3c5a5010d1a3044beaed4fa101ad3b266513696f
2024-03-07 20:57:34 +00:00
Shashwat Razdan
07f89b88fc Adding android.software.contextualsearch to zuma devices.
Bug: 326143814
Test: Built and tested on device
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3ceb5170ce03587387eaf794a4ee5d0c68540664)
Merged-In: I4ee1ecd9e292d6e1807ba1f77851e53380db0a07
Change-Id: I4ee1ecd9e292d6e1807ba1f77851e53380db0a07
2024-03-07 20:52:02 +00:00
Xin Li
329687e7b5 [automerger skipped] Merge Android 14 QPR2 to AOSP main am: 9410b32a49 -s ours am: 51173b9d7a -s ours
am skip reason: Merged-In I32eb36d69c485eaab1d138a6271e08660bfe39b0 with SHA-1 b3d1357a39 is already in history

Original change: https://android-review.googlesource.com/c/device/google/zuma/+/2990636

Change-Id: I3bef0bebcd271340ccedbd7e5db1ae2b9bd9bfa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 10:46:30 +00:00
Xin Li
51173b9d7a [automerger skipped] Merge Android 14 QPR2 to AOSP main am: 9410b32a49 -s ours
am skip reason: Merged-In I32eb36d69c485eaab1d138a6271e08660bfe39b0 with SHA-1 b3d1357a39 is already in history

Original change: https://android-review.googlesource.com/c/device/google/zuma/+/2990636

Change-Id: If32942ee0ddb855af378568ac6ea8be6982155fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 09:55:05 +00:00
Xin Li
9410b32a49 Merge Android 14 QPR2 to AOSP main
Bug: 319669529
Merged-In: I32eb36d69c485eaab1d138a6271e08660bfe39b0
Change-Id: Ie1a388e0381897e4b0522ffad710449f9ad465e4
2024-03-06 09:29:51 -08:00
Shashwat Razdan
791a68939f Merge "Adding android.software.contextualsearch to zuma devices." into main 2024-03-06 16:33:04 +00:00
Shashwat Razdan
3ceb5170ce Adding android.software.contextualsearch to zuma devices.
Bug: 326143814
Test: Built and tested on device
Change-Id: I4ee1ecd9e292d6e1807ba1f77851e53380db0a07
2024-03-05 23:46:52 -08:00
Hongyang Jiao
590a555cb9 Add betterbug.mk to zuma
Test: manual test
Bug: 322543833
Change-Id: Ibd314393d11b2552b79a7f73cd7ed888e08934b2
2024-03-05 23:30:04 +00:00
Bart Sears
738d2aa5db Merge "Revert "Add betterbug mk to zuma"" into main 2024-03-05 20:38:11 +00:00
Daniel Chapin
fe980182cc Revert "Add betterbug mk to zuma"
Revert submission 26348985-bb-sepolicy-poc

Reason for revert: Droidfood blocking bug: b/327991669

Bug: b/327991669

Reverted changes: /q/submissionid:26348985-bb-sepolicy-poc

Change-Id: I83de6f389e4ce5113afd751871e0e10e67fb0b4f
2024-03-05 20:37:25 +00:00
Treehugger Robot
3cfbf4bec2 Merge "Add media.c2 aidl fragments" into main 2024-03-05 06:17:02 +00:00
Mark Chang
f1794b994b Merge "Add sepolicy include to zuma." into main 2024-03-05 05:31:47 +00:00
Treehugger Robot
1793e986cc Merge "Move Gralloc packages to gs-common" into main 2024-03-04 22:13:55 +00:00
Android Build Coastguard Worker
3f512701c0 Snap for 11520864 from ad60710ab1 to 24Q2-release
Change-Id: Ice82c41ad5bf1f55dc356a3132ba9254b022dcb8
2024-03-02 02:03:28 +00:00
AleX Pelosi
ad60710ab1 Merge "pixelstats: added multiple GMSR paths" into main 2024-03-01 03:14:41 +00:00
Hongyang Jiao
4d42550e9a Merge "Add betterbug mk to zuma" into main 2024-03-01 01:10:47 +00:00
Juan Yescas
eb1c1ce936 zuma: Set max supported page size to 65536
Set the max page size on zuma devices to 65536.

Bug: 300367402
Test: readelf -Wl /system/bin/init
Change-Id: I4d3e45f5da1cfc50c639aea44d5670a936ca47a8
2024-02-29 13:11:48 -08:00
Jenny Ho
45b0145f0c pixelstats: added multiple GMSR paths
support different project paths

Bug: 308364170
Change-Id: Ifd5f1b609c0bf5fa98677f9880bfa29496add95d
Signed-off-by: Jenny Ho <hsiufangho@google.com>
2024-02-29 02:41:05 +00:00
Android Build Coastguard Worker
0b9a0c7c4a Snap for 11510485 from 18f3b37824 to 24Q2-release
Change-Id: Ib5ac5b01a5cd8249c68be2d8ecb9d96dc64e8b84
2024-02-29 00:03:53 +00:00
Mark Chang
47cbecc736 Add sepolicy include to zuma.
Bug: 325422902
Test: Manual, system booted without sepolicy denied error.

Change-Id: Ibbf4fd4f0eab82589915933d5c298839bc0c7f01
Signed-off-by: Mark Chang <changmark@google.com>
2024-02-28 13:37:07 +00:00
Rakesh Raghava
18f3b37824 Merge "Removed ImsMedia from zuma" into main 2024-02-28 11:56:49 +00:00
Mark Chang
d1247f2058 Merge "Revert "Add sepolicy include to zuma."" into main 2024-02-28 10:34:00 +00:00
Android Build Coastguard Worker
0ecbcae306 Snap for 11504324 from 28a906e86a to 24Q2-release
Change-Id: I3aff4f61ad2d481d6e80eb85608685c00b524dc3
2024-02-28 00:03:36 +00:00
Liana Kazanova
009c900677 Revert "Add sepolicy include to zuma."
Revert submission 26288713-twoshay-sepolicy-24

Reason for revert: DroidMonitor: Potential culprit for b/327235315 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Bug:327235315

Reverted changes: /q/submissionid:26288713-twoshay-sepolicy-24

Change-Id: I71fa628c86d239b53fdd80a7b124daf7b66e2ca0
2024-02-27 21:19:55 +00:00
Sungtak Lee
7847851d6c Enable AIDL media.c2
Bug: 321808716
Change-Id: I2c2d7d3d7539a65aa82125ab13f1498c6defdebf
2024-02-27 17:49:13 +00:00
Sungtak Lee
d19f4e8c95 Add media.c2 aidl fragments
Bug: 321808716
Change-Id: I0540df5a15d2186f511fac64de195f7656a78e3d
2024-02-27 17:28:23 +00:00
David Drysdale
28a906e86a Merge "Enable Secretkeeper HAL service on zuma" into main 2024-02-27 13:06:08 +00:00
Rakesh Raghava
7cb45f2978 Removed ImsMedia from zuma
- PixelImsMedia is used in zuma, so aosp ImsMedia is removed

Bug: 325148061
Test: mm
Change-Id: Ifcb93dfa9f06c08d34a7816c2a001f7115fc3baa
2024-02-27 09:57:45 +00:00
Mark Chang
a742e2f64b Merge "Add sepolicy include to zuma." into main 2024-02-27 09:43:47 +00:00
Treehugger Robot
3e0b001d9f Merge "pixelstats: zuma: add Learning/Update/ModelLoad path" into main 2024-02-27 04:06:18 +00:00
Devika Krishnadas
1fa8bf5885 Move Gralloc packages to gs-common
Bug: 275906497
Test: Boot succeeds

Change-Id: I879a5ef8365abe018c501cdb0b06c9753e0e5902
Signed-off-by: Devika Krishnadas <kdevika@google.com>
2024-02-26 17:58:11 +00:00
Mark Chang
79baa6c871 Add sepolicy include to zuma.
Bug: 325422902
Test: Manual, system booted without sepolicy denied error.
Change-Id: Ife2291ac6e510321217038cdd360603a0f3e3c57
Signed-off-by: Mark Chang <changmark@google.com>
2024-02-26 11:48:13 +00:00
Chungro Lee
553b0f5504 pixelstats: zuma: add Learning/Update/ModelLoad path
Upload more FG data to analyze its trends

Bug: 317827237
Change-Id: Id6cff09063ece9c08647f01dfd92bbe2e8e29580
Signed-off-by: Chungro Lee <chungro@google.com>
2024-02-25 09:14:08 +08:00
Android Build Coastguard Worker
533ebc18bf Snap for 11494200 from 1433ffe9e2 to 24Q2-release
Change-Id: I4e0b6c9f993a311b1121c3bd1324060d0f915e69
2024-02-25 00:03:12 +00:00
Gaurav Sarode
1433ffe9e2 Fix properties to enable override
bug: 326659788
Test: Local build
Change-Id: I7a4d2444b83753dd3f1197b02d6003a99a526d81
2024-02-23 16:02:29 -08:00
Hongyang Jiao
32305100e2 Add betterbug mk to zuma
Bug: 322543833
Test: local test, recorded in http://shortn/_iEz9DTCHgo
Change-Id: Idd83168e4e4bea43ec88afbc0823a76e879e9674
2024-02-23 23:54:49 +00:00
Android Build Coastguard Worker
84633bf24c Snap for 11479893 from 6f86f154f7 to 24Q2-release
Change-Id: Ief9ad1bcb81679d0b0248d77fbce18b562e525d1
2024-02-22 00:03:46 +00:00
David Drysdale
5375e70d96 Enable Secretkeeper HAL service on zuma
The prebuilts on `main` for zuma devices have been updated to include:
- the Secretkeeper TA in Trusty
- the ABL changes to retrieve the Secretkeeper identity pub key.

So enable the corresponding HAL service for Secretkeeper when the
relevant build flag is enabled.

Bug: 291228655
Bug: 306364873
Test: VtsSecretkeeperTargetTest on shiba
Change-Id: Ida12d0742c1e74e15e0f5606ab19cdb90afbcb2b
2024-02-21 12:37:09 +00:00
Daniel Okazaki
6f86f154f7 dumpstate: moving charger nodes to user build
Bug: 323415060
Test: adb bugreport
Change-Id: Ic40a2a19e9f94ee294d27ac1164d6d192e111660
Signed-off-by: Daniel Okazaki <dtokazaki@google.com>
2024-02-17 01:19:49 +00:00
Android Build Coastguard Worker
26aa6fcce9 Merge "Snap for 11456215 from 34c969d4c5 to 24Q2-release" into 24Q2-release 2024-02-16 01:40:36 +00:00
Android Build Coastguard Worker
13152c6a07 Merge "Snap for 11456215 from 34c969d4c5 to 24Q2-release" into 24Q2-release 2024-02-16 01:33:10 +00:00
Android Build Coastguard Worker
b9a8feb573 Snap for 11456215 from 34c969d4c5 to 24Q2-release
Change-Id: If067a98f56a6875f0f8314e5f29e19d66c7297ad
2024-02-16 00:34:15 +00:00
Android Build Coastguard Worker
03d10c4d62 Snap for 11456215 from 34c969d4c5 to 24Q2-release
Change-Id: I99f3503d75c5752e937b713e1d3969b37174d7d5
2024-02-16 00:22:15 +00:00
Android Build Coastguard Worker
a2925641a8 Snap for 11456215 from 34c969d4c5 to 24Q2-release
Change-Id: If634d67c6e0afc0ec352037f9f5f51c76317ca3b
2024-02-16 00:20:35 +00:00