Xin Li
9c5bf82aa3
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 2201804c6b
-s ours am: 6e217905f3
-s ours am: 3178ffe865
-s ours
...
am skip reason: Merged-In I56e2296651999e37048f8be4c53d7c5b9281666f with SHA-1 bca92bdc76
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17545171
Change-Id: Ie247f25562e3fd515a249dbfd4e1a77da2d8c26b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 08:29:54 +00:00
Xin Li
3178ffe865
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 2201804c6b
-s ours am: 6e217905f3
-s ours
...
am skip reason: Merged-In I56e2296651999e37048f8be4c53d7c5b9281666f with SHA-1 bca92bdc76
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17545171
Change-Id: Ic5fe62a1b7898212c7acd9cc794b320f717e4b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 07:43:59 +00:00
Xin Li
6e217905f3
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 2201804c6b
-s ours
...
am skip reason: Merged-In I56e2296651999e37048f8be4c53d7c5b9281666f with SHA-1 bca92bdc76
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17545171
Change-Id: I51b157da898e69fc63a95e34f60d4c07b1285073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 07:11:59 +00:00
Kelly Rossmoyer
fc0bb0e1b9
Revert "powerstats: set time limit as timeout for AoC" am: 7eb5f7e1db
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17544421
Change-Id: Iba19651ac1606fb38458b634e508bbdc59c87dde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 22:35:00 +00:00
Kelly Rossmoyer
7eb5f7e1db
Revert "powerstats: set time limit as timeout for AoC"
...
Revert "powerstats: set time limit as timeout for AoC"
Revert "powerstats: timeout mechanism for AoC data provider"
Revert submission 17442015-powerstats-aoc-timeout
Reason for revert: Causes PowerStatsHAL crashes (b/227578192)
Reverted Changes:
I9a9eb27fa:powerstats: set time limit as timeout for AoC
Ib70000580:powerstats: timeout mechanism for AoC data provide...
Ied599054c:Revert "powerstats: disable AoC power stats report...
Iaf5af43eb:powerstats: set time limit as timeout for AoC
Change-Id: I7b7a42d3f94769bf937a4d9693444a5f4550dc3f
2022-04-01 22:16:22 +00:00
Xin Li
2201804c6b
Merge Android 12 QPR3 ab/8391262
...
Bug: 226662282
Merged-In: I56e2296651999e37048f8be4c53d7c5b9281666f
Change-Id: I53581f8c0cd4d3e220faf53468f4d571cb823f4c
2022-04-01 20:32:11 +00:00
Eric Laurent
24c26591e6
Revert "Revert "[automerge] Disable spatial audio feature 2p: 68f33d6043
am: 95c69ea86e
"" am: 9e1de421e6
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17538129
Change-Id: I2ebe42c9de5014c5c4a0743b99f9395ec66f2878
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 19:11:49 +00:00
Eric Laurent
9e1de421e6
Revert "Revert "[automerge] Disable spatial audio feature 2p: 68f33d6043
am: 95c69ea86e
""
...
This reverts commit 2dc3c4cb18
.
Reason for revert: Spatial audio demo
Change-Id: Ia3288900ca86f9555750c469385f365031d989f4
2022-04-01 18:51:54 +00:00
Edwin Tung
39023c5078
[automerger skipped] [DO NOT MERGE] gps: update gps driver 129.20.23.529478 am: bca92bdc76
-s ours am: df49a2dfc4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17509104
Change-Id: I6abbefbb83716a6f7903f7e7b96f58b2d65b960a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 05:41:28 +00:00
Edwin Tung
df49a2dfc4
[automerger skipped] [DO NOT MERGE] gps: update gps driver 129.20.23.529478 am: bca92bdc76
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17509104
Change-Id: I601d306c39afeb7bd2a862540762ba498eec0c12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 05:28:36 +00:00
Edwin Tung
bca92bdc76
[DO NOT MERGE] gps: update gps driver 129.20.23.529478
...
Fix NI control plane issue
Add NFW IPC between AP and CP
Ignore RTI in cold start
Fix OnChip logging issue
Bug: 221337679
Bug: 216098015
Bug: 219856838
Bug: 213009701
Verify test: 224635609
Test: atest VtsHalGnssTargetTest
atest CtsLocationGnssTestCases
atest GtsLocationTestCases
atest PtsChreTestRunner
Change-Id: I56e2296651999e37048f8be4c53d7c5b9281666f
2022-03-31 05:12:19 +00:00
Edwin Tung
2ff3ad5e1d
[automerger skipped] [DO NOT MERGE] gps: update gps driver 129.20.23.529475 am: f1a2063e14
-s ours am: 8d71c97361
-s ours am: 8a7f261ef7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17253583
Change-Id: Ib58e6f2f58ae6cbb7fc50569c9b6e8112d27fb9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 01:20:37 +00:00
Edwin Tung
8a7f261ef7
[automerger skipped] [DO NOT MERGE] gps: update gps driver 129.20.23.529475 am: f1a2063e14
-s ours am: 8d71c97361
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17253583
Change-Id: Ibdea2d11208517b06d867cd45f9ae2d46183d447
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 01:06:01 +00:00
Edwin Tung
8d71c97361
[automerger skipped] [DO NOT MERGE] gps: update gps driver 129.20.23.529475 am: f1a2063e14
-s ours
...
am skip reason: skipped by user edwintung
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17253583
Change-Id: I44b43b854d4c7e25235570bfe43e10209434b8ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 00:41:26 +00:00
Eric Laurent
f1279a480f
Revert "[automerge] Disable spatial audio feature 2p: 68f33d6043
am: 95c69ea86e
" am: 2dc3c4cb18
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17504352
Change-Id: I4b662b1800c9a64d57a336cef58ec655dcbef0af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 18:29:37 +00:00
Eric Laurent
2dc3c4cb18
Revert "[automerge] Disable spatial audio feature 2p: 68f33d6043
am: 95c69ea86e
"
...
This reverts commit 6618135690
.
Reason for revert: Spatial audio demo
Change-Id: Ie44a31102cc6e335eaf922fa7c42c944a60b0920
2022-03-30 18:02:56 +00:00
Edwin Tung
f1a2063e14
[DO NOT MERGE] gps: update gps driver 129.20.23.529475
...
Add NFW IPC between AP and CP
Fix NI control plane issue
Ignore RTI in cold start
Fix OnChip logging issue
Bug: 216098015
Bug: 221337679
Bug: 219856838
Bug: 213009701
Verify test: 224635609
Test: atest VtsHalGnssTargetTest
atest CtsLocationGnssTestCases
atest GtsLocationTestCases
atest PtsChreTestRunner
Change-Id: I89fcf1f61fce350201e6b433895289d3a3912c61
2022-03-30 11:33:18 +00:00
Darren Hsu
fc431a1d88
powerstats: set time limit as timeout for AoC am: 0be3bbd083
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17442334
Change-Id: Icf49fc926ae7f9f3fa1e6fe38460af82dede7d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 08:21:47 +00:00
Darren Hsu
0be3bbd083
powerstats: set time limit as timeout for AoC
...
Bug: 219630658
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I9a9eb27fab549f4351bcfae6e335e050c48fc753
Signed-off-by: Darren Hsu <darrenhsu@google.com>
2022-03-30 08:05:25 +00:00
chungkai
0cca5f4daa
init: add uclamp threshold setting am: c99aafcbc9
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17178849
Change-Id: Ie36db30896bf8df686807aa18e85283de32ce1e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 04:04:32 +00:00
chungkai
c99aafcbc9
init: add uclamp threshold setting
...
To filter tiny task, add uclamp threshold setting
Test: build and boot pass
Bug: 214098855
Signed-off-by: chungkai <chungkai@google.com>
Change-Id: I20c7d5228b81b9ef27660f5b4d120b3c4c584276
2022-03-30 03:50:02 +00:00
Presubmit Automerger Backend
9b650e3fde
[automerge] Disable spatial audio feature 2p: 68f33d6043
am: 95c69ea86e
am: 6618135690
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17435542
Change-Id: I9b314238f148e65ddd1f96d83569ae832847f15f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 18:00:39 +00:00
Presubmit Automerger Backend
6618135690
[automerge] Disable spatial audio feature 2p: 68f33d6043
am: 95c69ea86e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17435542
Change-Id: I598c374685ab2e891054167fc0c69e8fe4fbcac5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 17:37:26 +00:00
Presubmit Automerger Backend
95c69ea86e
[automerge] Disable spatial audio feature 2p: 68f33d6043
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17435542
Bug: 225119469
Change-Id: I8e22f367c4815081e403f3f5c3d6be0b2928e193
2022-03-29 14:10:50 +00:00
chungkai
c23a7cb09b
sched: move sysfs to procfs am: abf92a16d6
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17469423
Change-Id: I953e0013844d82361a7c5c572c9f706665ec35a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 10:38:38 +00:00
chungkai
abf92a16d6
sched: move sysfs to procfs
...
Modify the path of vendor_sched nodes
Test: work normally
Bug: 216207007
Signed-off-by: chungkai <chungkai@google.com>
Change-Id: Id9d85bb742dbfe96cc7e9fe8572a6a610a9f592e
2022-03-29 10:02:47 +00:00
Jenny Ho
b0d6bce849
dumpstate: dump AACR related data am: 1549259d37
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17442330
Change-Id: I2ceadd353977ae7a420fbbd33e6af8e33f94cb33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 08:37:50 +00:00
Jenny Ho
1549259d37
dumpstate: dump AACR related data
...
Add charging table and capacity dump for
Age Adjusted Charge Rate (AACR) feature
Bug: 209987670
Signed-off-by: Jenny Ho <hsiufangho@google.com>
Change-Id: Ic9dd435557bf4e941fcbdb48fb134c938dd5be83
(cherry picked from commit 5b71630967
)
2022-03-29 08:10:15 +00:00
Jenny Ho
10ca4d5c5a
Merge changes from topic "presubmit-am-0059be3607e74b86bc0b8e012b2dd05e" into tm-mainline-prod
...
* changes:
dumpstate: dump AACR related data
[automerge] dumpstate: dump AACR related data 2p: 95c0f5c498
2022-03-29 08:10:15 +00:00
Luigi Zevola
f2184c0a94
dumpstate: remove tasks prints and clean up am: f0cc850c9a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17454549
Change-Id: Ia51738b43a3b017301fc1b906afb304a6841d397
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 02:22:13 +00:00
Luigi Zevola
f0cc850c9a
dumpstate: remove tasks prints and clean up
...
Remove tasks printing when dumping state and clean up format
Bug: 226718218
Test: On R4
Signed-off-by: Luigi Zevola <zevola@google.com>
Change-Id: I596dc6ffa047d951cb87a9905d145cdaa8365d2e
(cherry picked from commit 734c360052
)
2022-03-28 21:46:09 +00:00
Presubmit Automerger Backend
7370391f5b
[automerge] dumpstate: dump AACR related data 2p: 95c0f5c498
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17442330
Bug: 209987670
Change-Id: I0f5e58e9c1f17d9425301dd9bd8cb8106d484bba
2022-03-28 20:21:56 +00:00
Eric Laurent
68f33d6043
Disable spatial audio feature
...
Bug: 225119469
Test: verify MP3 offload
Change-Id: I6a8956ed8a0873cd2426c6a81d79452cc1f5b78f
2022-03-28 20:14:16 +02:00
Alessio Balsini
24b588c6b7
FUSE-BPF: Disable the feature am: 55b3a32128
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17435537
Change-Id: I257b759b2f9518c75e6d263aa3109e5b4e82a5a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 13:42:14 +00:00
Alessio Balsini
55b3a32128
FUSE-BPF: Disable the feature
...
FUSE-BPF has been identified to be causing issues with the Audible app.
Disable the feature to mitigate the breakages while investigating the
issue.
Bug: 227042065
Test: adb shell getprop ro.fuse.bpf.enabled | grep false
Signed-off-by: Alessio Balsini <balsini@google.com>
Change-Id: I9edbf4bcbc7c293f541936baf80e318a87eeb2a3
2022-03-28 11:55:29 +00:00
Treehugger Robot
7a07812f90
Merge "powerstats: add AoC restart count stats" am: 7dd7e93a03
am: 225dd70fe3
am: a5107c2a27
am: 20f5c3391f
...
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2044845
Change-Id: I52321b98702de7dc2c212a28e261393a6a68fa4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 09:09:27 +00:00
Treehugger Robot
20f5c3391f
Merge "powerstats: add AoC restart count stats" am: 7dd7e93a03
am: 225dd70fe3
am: a5107c2a27
...
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2044845
Change-Id: I12d6ac32aafd604b8f29b88fab9af85a2e2963e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 08:41:17 +00:00
Treehugger Robot
a5107c2a27
Merge "powerstats: add AoC restart count stats" am: 7dd7e93a03
am: 225dd70fe3
...
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2044845
Change-Id: I505f8088328b950ab7dc40823f90c0f6b2ad8c8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 08:17:33 +00:00
Jenny Ho
95c0f5c498
dumpstate: dump AACR related data
...
Add charging table and capacity dump for
Age Adjusted Charge Rate (AACR) feature
Bug: 209987670
Signed-off-by: Jenny Ho <hsiufangho@google.com>
Change-Id: Ic9dd435557bf4e941fcbdb48fb134c938dd5be83
(cherry picked from commit 5b71630967
)
2022-03-28 08:09:26 +00:00
Treehugger Robot
225dd70fe3
Merge "powerstats: add AoC restart count stats" am: 7dd7e93a03
...
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2044845
Change-Id: I4687eb012e379fba3b24fc9ef0ab1a4d4ce89746
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:51:38 +00:00
Treehugger Robot
7dd7e93a03
Merge "powerstats: add AoC restart count stats"
2022-03-28 07:32:15 +00:00
Jenny Ho
886e3e2346
init.gs101.rc: set dev_sn for battery pairing am: 31d519c4b4
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17365287
Change-Id: I3b421820e8584549d5ab0f6e188aee24e0e9b808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 02:05:19 +00:00
Jenny Ho
31d519c4b4
init.gs101.rc: set dev_sn for battery pairing
...
Bug: 216583288
Signed-off-by: Jenny Ho <hsiufangho@google.com>
Change-Id: I58a243b711025d0dd6f3980c84462d8f392841cc
2022-03-28 01:45:03 +00:00
Cole Faust
6521b9b3f8
Remove usage of intermediates-dir-for am: 4293b68380
am: 4449d053d5
am: fe6f545c69
am: 10e96ef8d5
...
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2042723
Change-Id: I88a987a953102e3568ccb6db0f894dcf34a73110
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 18:53:30 +00:00
Cole Faust
10e96ef8d5
Remove usage of intermediates-dir-for am: 4293b68380
am: 4449d053d5
am: fe6f545c69
...
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2042723
Change-Id: I005566c7911846554790aca235206cc281058d79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 18:39:33 +00:00
Cole Faust
fe6f545c69
Remove usage of intermediates-dir-for am: 4293b68380
am: 4449d053d5
...
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2042723
Change-Id: I32a1757d9e9bab23dcd3741c924c1b9907b29692
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 18:18:42 +00:00
Cole Faust
4449d053d5
Remove usage of intermediates-dir-for am: 4293b68380
...
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2042723
Change-Id: Ic8d95d6fcc995ad1ce6b3197a35bda0acc371aa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:54:18 +00:00
Sam Dubey
ea5f5b02e8
Revert "Enable load kernel modules in parallel" am: 293b0c871d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17395407
Change-Id: I0949677794f6fa83df4d7ef23d4f403467b6575a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 10:46:09 +00:00
Sam Dubey
293b0c871d
Revert "Enable load kernel modules in parallel"
...
This reverts commit 264b325dd1
.
Reason for revert: Boot crashes on gs101 devices
Bug: 226705295
Change-Id: Id074bbc5fdc9f747f45d01405f5b08f37e5617f3
2022-03-25 10:30:47 +00:00
Darren Hsu
67f3dda062
powerstats: add AoC restart count stats am: cce5e9f8b0
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17365283
Change-Id: I3e5830b6a14e797eceb61a8f179358ccee64ee02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 07:19:07 +00:00