Xin Li
1aade33ca5
Merge Android 14 QPR3 to AOSP main am: c3387ab656
...
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3132134
Change-Id: Ib7a8ed951ffe015060bb9ba2f69171fad85243b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-17 20:41:21 +00:00
Xin Li
c3387ab656
Merge Android 14 QPR3 to AOSP main
...
Bug: 346855327
Merged-In:
Change-Id: I6e2d2db806623c6e6676d852eb62af6b426e9438
2024-06-13 10:49:16 -07:00
Xin Li
646c59ec64
Merge "Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future" into aosp-main-future
2024-06-06 20:54:41 +00:00
Jim Tang
df858c9c6b
Make SUPPORT_MULTI_SIM recognizable in bp am: 1f43d128df
...
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3115579
Change-Id: I738f8061af6233116654c1a3f0af121b90308e89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 08:16:01 +00:00
Jim Tang
1f43d128df
Make SUPPORT_MULTI_SIM recognizable in bp
...
This commit establishes a soong config variable `sim_count` for
easier converting Android.mk to Android.bp when dealing with multiple
SIMs.
Bug: 343823190
Test: presubmit
Change-Id: I93d355e30771868f1c4664eebbce579e1e37cdcb
2024-06-06 15:02:16 +08:00
Xin Li
afc3cc5de2
Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future
...
Bug: 343100748
Merged-In: I7582ba278abcb30cebe041f775efe45633a58bad
Change-Id: I687291c5b9c17cb27f13fde59370d91ced06ee09
2024-06-05 14:12:12 -07:00
Cyan_Hsieh
750d77c19f
Switch makefile owners to MK_OWNERS am: 86e9f51a58
...
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3106782
Change-Id: If1a015f6f3bba24c4f5e2fa3b8f2f610d57a7903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 14:29:14 +00:00
Cyan_Hsieh
86e9f51a58
Switch makefile owners to MK_OWNERS
...
Bug: 278167548
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:621df82f7af10ff85fa290af75c729f734cb2938 )
Merged-In: I7c3083ad4d881334c6f8f78d89b6a31fcd46c42e
Change-Id: I7c3083ad4d881334c6f8f78d89b6a31fcd46c42e
2024-05-29 10:00:58 +00:00
Xin Li
dd443fbb75
Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
...
Bug: 337098550
Merged-In: Ifd5f1b609c0bf5fa98677f9880bfa29496add95d
Change-Id: I15da0840ac7291b41519ae4ae82b09b3c6b5148f
2024-05-06 12:09:17 -07:00
Treehugger Robot
646464efa7
Merge "Update USES_LASSEN_MODEM soong config settings for aosp projects." into main am: fca2c9d122
...
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3037358
Change-Id: I34b248f1d76b8b90079f775a9c6c76bf3265fea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-29 09:42:17 +00:00
Treehugger Robot
fca2c9d122
Merge "Update USES_LASSEN_MODEM soong config settings for aosp projects." into main
2024-04-29 09:25:56 +00:00
Herbert Xue
34b4efdcc8
Update USES_LASSEN_MODEM soong config settings for aosp projects.
...
Add the flag "use_lassen_modem" for bp to do the same checking like
"USES_LASSEN_MODEM" in mk.
Bug: 330654744
Test: 1. lunch aosp_cheetah-trunk_staging-userdebug
2. m RilConfigService
Change-Id: I4ef0fe469e98fa6315896bbe8c422f741e207664
2024-04-29 16:26:24 +08:00
Android Build Coastguard Worker
6a6766d878
Merge cherrypicks of ['android-review.googlesource.com/3009648'] into 24Q2-release.
...
Change-Id: I13b9f2ca30340a6b5a11d590106d3200d9dd4d46
2024-03-26 23:37:01 +00:00
Jack Wu
956405c6c0
Update health AIDL HAL to V3
...
Bug: 328327545
Test: TH
Test: vts-tradefed run vts -m vts_treble_vintf_vendor_test
Signed-off-by: Jack Wu <wjack@google.com>
(cherry picked from https://android-review.googlesource.com/q/commit:40f89b2d464071389d395f39928ef0e6d99bf2fb )
Merged-In: I7582ba278abcb30cebe041f775efe45633a58bad
Change-Id: I7582ba278abcb30cebe041f775efe45633a58bad
2024-03-26 23:19:37 +00:00
Vilas Bhat
19eefd7be5
Merge "16k: zuma: Remove PRODUCT_MAX_PAGE_SIZE_SUPPORTED, set to 16384 by default" into main am: 9f46e1bc8a
...
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3009017
Change-Id: I62eeed1a5d24504c67c9b11a8e07c4874a4c95f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-26 00:32:26 +00:00
Vilas Bhat
9f46e1bc8a
Merge "16k: zuma: Remove PRODUCT_MAX_PAGE_SIZE_SUPPORTED, set to 16384 by default" into main
2024-03-26 00:11:12 +00:00
Vilas Bhat
2c6de7bc7a
16k: zuma: Remove PRODUCT_MAX_PAGE_SIZE_SUPPORTED, set to 16384 by default
...
b/300367402 has been resolved and PRODUCT_MAX_PAGE_SIZE_SUPPORTED
override is not needed anymore as the default value is set to 16384.
Bug: 310232825
Bug: 300367402
Change-Id: I0a319a2ede0897bcde97214c70ebf099062bac0d
2024-03-26 00:06:22 +00:00
Jack Wu
b3ae3a6b85
Update health AIDL HAL to V3 am: 40f89b2d46
...
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3009648
Change-Id: Ia38afc00d2ea7b36cdb40c6500ac6ce7becb6800
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-22 17:43:36 +00:00
Jack Wu
40f89b2d46
Update health AIDL HAL to V3
...
Bug: 328327545
Test: TH
Test: vts-tradefed run vts -m vts_treble_vintf_vendor_test
Change-Id: I7582ba278abcb30cebe041f775efe45633a58bad
Signed-off-by: Jack Wu <wjack@google.com>
2024-03-22 21:38:07 +08: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
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
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
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
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
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
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