Xin Li
a4669a71e7
[automerger skipped] Merge Android 13 QPR1 am: cbe92d054f -s ours
...
am skip reason: Merged-In Iad7403dcbc0ad12b77154003f4aa61afedf2224f with SHA-1 edf8707658 is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs-common/+/2338115
Change-Id: I24283739c67bab0b38b62fb856782808633a2cb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 23:14:31 +00:00
Xin Li
cbe92d054f
Merge Android 13 QPR1
...
Bug: 261731544
Merged-In: Iad7403dcbc0ad12b77154003f4aa61afedf2224f
Change-Id: I65b94dc4d20397033286eeaa94912e8bb2525119
2022-12-09 10:24:29 -08:00
Xin Li
8d040eaa88
Merge tm-qpr-dev-plus-aosp-without-vendor@9129937
...
Bug: 248070379
Merged-In: Iad7403dcbc0ad12b77154003f4aa61afedf2224f
Change-Id: I9935427749553aeb99b8682c8dd63b0af392d275
2022-10-06 12:00:20 -07:00
Xin Li
aa750b3188
[automerger skipped] DO NOT MERGE - Merge Android 13 am: a487ed63a3 -s ours am: 2b82c4fa05 -s ours am: 7a227ed470 -s ours
...
am skip reason: Merged-In Iad7403dcbc0ad12b77154003f4aa61afedf2224f with SHA-1 edf8707658 is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs-common/+/2185745
Change-Id: Iaa29568512cc1267af2eb329346761ffb3ec2344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 01:22:23 +00:00
Xin Li
7a227ed470
[automerger skipped] DO NOT MERGE - Merge Android 13 am: a487ed63a3 -s ours am: 2b82c4fa05 -s ours
...
am skip reason: Merged-In Iad7403dcbc0ad12b77154003f4aa61afedf2224f with SHA-1 edf8707658 is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs-common/+/2185745
Change-Id: I55f71a74420a3101e8c04331ad492737ae569e1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:58:30 +00:00
Xin Li
2b82c4fa05
[automerger skipped] DO NOT MERGE - Merge Android 13 am: a487ed63a3 -s ours
...
am skip reason: Merged-In Iad7403dcbc0ad12b77154003f4aa61afedf2224f with SHA-1 edf8707658 is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs-common/+/2185745
Change-Id: Ib122444c9eba788a95dac793de08faa379ca7b87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:35:42 +00:00
Xin Li
a487ed63a3
DO NOT MERGE - Merge Android 13
...
Bug: 242648940
Merged-In: Iad7403dcbc0ad12b77154003f4aa61afedf2224f
Change-Id: I8921e6bd51faed5421dea32709e331c2cdae58a5
2022-08-15 21:59:58 -07:00
Adam Shih
f9b0293f5b
add owners to manage gs-common am: edf8707658 am: 9eaa8d078d am: 8e43cfa48e am: d6db858b7f
...
Original change: https://android-review.googlesource.com/c/device/google/gs-common/+/2185155
Change-Id: Ife384421cd137a28de3d075163460e49b7d18514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 05:23:02 +00:00
Adam Shih
d6db858b7f
add owners to manage gs-common am: edf8707658 am: 9eaa8d078d am: 8e43cfa48e
...
Original change: https://android-review.googlesource.com/c/device/google/gs-common/+/2185155
Change-Id: I2d076f4f236ae5d16bb75f9640aad1d9b26ea65e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 04:47:11 +00:00
Adam Shih
8e43cfa48e
add owners to manage gs-common am: edf8707658 am: 9eaa8d078d
...
Original change: https://android-review.googlesource.com/c/device/google/gs-common/+/2185155
Change-Id: Ic7f65a0e3b4a1aba82c0cfafc8b75db69a3cc847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 04:23:04 +00:00
Adam Shih
9eaa8d078d
add owners to manage gs-common am: edf8707658
...
Original change: https://android-review.googlesource.com/c/device/google/gs-common/+/2185155
Change-Id: I0ab953c20e9af775869e13137fdf91e89dad4cef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 04:02:13 +00:00
Adam Shih
edf8707658
add owners to manage gs-common
...
Bug: 240530709
Test: build pass
Change-Id: Iad7403dcbc0ad12b77154003f4aa61afedf2224f
2022-08-12 09:55:21 +08:00
Xin Li
b6f66be0f9
[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: deea5f2205 -s ours am: 95cf66db9e -s ours am: 841051c977 -s ours
...
am skip reason: Merged-In I6844a141739f93154d10debc29c7565f92349d25 with SHA-1 20b039192d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/19094399
Change-Id: If12a03613eac7a634f44805c31855cc4bf0803a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 00:02:36 +00:00
Xin Li
841051c977
[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: deea5f2205 -s ours am: 95cf66db9e -s ours
...
am skip reason: Merged-In I6844a141739f93154d10debc29c7565f92349d25 with SHA-1 20b039192d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/19094399
Change-Id: Iddca79e1f20f29170ee5d90d817c3d4357ac7d1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 22:56:52 +00:00
Xin Li
95cf66db9e
[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: deea5f2205 -s ours
...
am skip reason: Merged-In I6844a141739f93154d10debc29c7565f92349d25 with SHA-1 20b039192d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/19094399
Change-Id: I005f183fdbf40be59143ee48f6b52b70d2de3165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 22:13:22 +00:00
Xin Li
deea5f2205
Merge tm-dev-plus-aosp-without-vendor@8763363
...
Bug: 236760014
Merged-In: I6844a141739f93154d10debc29c7565f92349d25
Change-Id: I9e50a9e46d764e98862bc1b9f4d127040a34cde4
2022-06-27 23:37:33 +00:00
Darren Hsu
a5a01d4cc7
powerstats: add new parameter to provide aoc clock am: 2756ac31ff am: cc5583141a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18966586
Change-Id: I1881f0fa848b47148ff23c624bf645bb943567fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 04:26:59 +00:00
Darren Hsu
af4ed69699
powerstats: add new parameter to provide aoc clock am: 2756ac31ff am: 46a9f0ac04
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18966586
Change-Id: I54761bf9a3af8761fe680eea41077f8401fe9072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 04:26:44 +00:00
Darren Hsu
cc5583141a
powerstats: add new parameter to provide aoc clock am: 2756ac31ff
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18966586
Change-Id: I88a668a92b324132d456209362bd065b788460f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 04:00:12 +00:00
Darren Hsu
46a9f0ac04
powerstats: add new parameter to provide aoc clock am: 2756ac31ff
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18966586
Change-Id: I5da4ca45fe040c37914a35141083782220adabcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 04:00:12 +00:00
Darren Hsu
2756ac31ff
powerstats: add new parameter to provide aoc clock
...
AoC power stats are reported in ticks that are different frequency
in different SoC.
Bug: 233923713
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I047d7ae163941c2168dcd8a0ea34da73ab4a8477
Merged-In: I047d7ae163941c2168dcd8a0ea34da73ab4a8477
Signed-off-by: Darren Hsu <darrenhsu@google.com>
2022-06-17 12:45:53 +00:00
Sam Dubey
3605c7902c
Revert "Use libaoc to provide consistent timestamp calculations" am: 33552445b8 am: 116941d5cf
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18817091
Change-Id: I50520e960eda489beb64c1ffdc22dde20384815c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 05:06:23 +00:00
Sam Dubey
ca4f0cba4c
Revert "Use libaoc to provide consistent timestamp calculations" am: 33552445b8 am: 9570f914cf
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18817091
Change-Id: I7003b28ffa06a7dba9c21086ca780f63f5f5f172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 05:06:05 +00:00
Sam Dubey
116941d5cf
Revert "Use libaoc to provide consistent timestamp calculations" am: 33552445b8
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18817091
Change-Id: I707cabef3056776f2de4348c01743c6e8d91d77c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 04:50:48 +00:00
Sam Dubey
9570f914cf
Revert "Use libaoc to provide consistent timestamp calculations" am: 33552445b8
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18817091
Change-Id: I6804f84f5155da711012620a4a7f2ff223eec11b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 04:50:48 +00:00
Sam Dubey
33552445b8
Revert "Use libaoc to provide consistent timestamp calculations"
...
Revert "Allow libaoc to be used in more contexts"
Revert submission 18605412-b-233923713
Reason for revert: Completely broke master-without-vendor
Bug: 235533674
Reverted Changes:
Iacd541815:Use libaoc to provide consistent timestamp calcula...
Id31ee3439:Allow libaoc to be used in more contexts
Change-Id: I3345d0e4baa8d5dce22be20f0213ad1421ce1a90
2022-06-10 03:23:56 +00:00
Craig Dooley
ebac96bd5d
Use libaoc to provide consistent timestamp calculations am: 9f4ac2c565 am: 1925d8a8d5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18744881
Change-Id: I1be4f39fed2997c4c5dbc2f22e7b530ab7545a97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 23:11:00 +00:00
Craig Dooley
e41d11496c
Use libaoc to provide consistent timestamp calculations am: 9f4ac2c565 am: 8259bcf6fa
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18744881
Change-Id: Id6116cff1523def86640e9846dcf1be54aa6c432
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 23:10:41 +00:00
Craig Dooley
1925d8a8d5
Use libaoc to provide consistent timestamp calculations am: 9f4ac2c565
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18744881
Change-Id: I2738efe99e69d0911a30408e9e48a2ef09213301
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 22:47:16 +00:00
Craig Dooley
8259bcf6fa
Use libaoc to provide consistent timestamp calculations am: 9f4ac2c565
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18744881
Change-Id: I9caf2ea34473687feda3e39d5640241cc76b58e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 22:47:07 +00:00
Craig Dooley
9f4ac2c565
Use libaoc to provide consistent timestamp calculations
...
Bug: 233923713
Change-Id: Iacd541815f40adef879e05d9bd8ded056e9a760d
2022-06-04 05:11:46 +00:00
Darren Hsu
ca73cc6467
powerstats: Introduce AoC timed data provider am: 391f601be6 am: cc57290bc2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18133407
Change-Id: I199c2d8e7cc0429c0d373049591989a1a16e863f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 17:51:49 +00:00
Darren Hsu
24d1a71244
powerstats: Introduce AoC timed data provider am: 391f601be6 am: 9a9d55e7a4
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18133407
Change-Id: I90ffb4d5a82c08ad51f7b351dd2b311618ce47c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:04:42 +00:00
Darren Hsu
9a9d55e7a4
powerstats: Introduce AoC timed data provider am: 391f601be6
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18133407
Change-Id: I917fcf8e180ccefffbb2d265e8fa24a2c8c6f126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:31:55 +00:00
Darren Hsu
cc57290bc2
powerstats: Introduce AoC timed data provider am: 391f601be6
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18133407
Change-Id: Ied87d80cb8d488684ad2401e7a11181365bd801a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:31:45 +00:00
Darren Hsu
391f601be6
powerstats: Introduce AoC timed data provider
...
Reading data from an AoC sysfs node by getline takes 1 second. In total
there are 17 AoC sysfs nodes that must be read. The worst case is taking
17 seconds long that is greater than dumpsys timeout. Therefore, we need
the timeout mechanism to ignore the AoC power stats reporting when AoC
latency exceeds the allowed time.
Bug: 219630658
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: Ic5c2a0b36728153fd2e2593599a8f2bcdb50ace4
Signed-off-by: Darren Hsu <darrenhsu@google.com>
2022-05-03 03:30:42 +00:00
Automerger Merge Worker
2f5eb7406f
Merge "Revert "powerstats: timeout mechanism for AoC data provider" am: 20b039192d am: 3ecc24fc06" into tm-d1-dev-plus-aosp am: 0c0fef6b10
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17935512
Change-Id: Icd770d4976f0f1864ea5e87d160b3247ebc2a6cb
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 05:02:57 +00:00
Kelly Rossmoyer
2672089095
Revert "powerstats: timeout mechanism for AoC data provider" am: 20b039192d am: 4cf26f2c2d am: 7a39e48a7b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17935512
Change-Id: Ic56a4f488beeccbc51f8f94e1b0b5cbac1be76e9
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 05:02:31 +00:00
Kelly Rossmoyer
c36288e364
Revert "powerstats: timeout mechanism for AoC data provider" am: 20b039192d am: 4cf26f2c2d am: 9cfc2829e8
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17935512
Change-Id: I0da2a2161254d566b1fd4de4abb578a61cdfb7e9
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 05:02:12 +00:00
Automerger Merge Worker
0c0fef6b10
Merge "Revert "powerstats: timeout mechanism for AoC data provider" am: 20b039192d am: 3ecc24fc06" into tm-d1-dev-plus-aosp
2022-04-25 04:42:02 +00:00
Kelly Rossmoyer
7a39e48a7b
Revert "powerstats: timeout mechanism for AoC data provider" am: 20b039192d am: 4cf26f2c2d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17935512
Change-Id: I83777757e5c5fc8ae890f1afd88951f92c899675
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:41:54 +00:00
Kelly Rossmoyer
e1f50e7b8c
Revert "powerstats: timeout mechanism for AoC data provider" am: 20b039192d am: 3ecc24fc06
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17935512
Change-Id: I6eb27b99f820f92b530f2a6bb8d88be136d22679
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:41:54 +00:00
Kelly Rossmoyer
9cfc2829e8
Revert "powerstats: timeout mechanism for AoC data provider" am: 20b039192d am: 4cf26f2c2d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17935512
Change-Id: I6eea43ccf275eb8c37d08f74e62db61c217841ba
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:41:53 +00:00
Kelly Rossmoyer
4cf26f2c2d
Revert "powerstats: timeout mechanism for AoC data provider" am: 20b039192d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17935512
Change-Id: I0136c81c6565650d3245a4ef9acc39af81235617
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:18:15 +00:00
Kelly Rossmoyer
3ecc24fc06
Revert "powerstats: timeout mechanism for AoC data provider" am: 20b039192d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17935512
Change-Id: I5d4ed81801f63aa6c0143ab8b78769aa1512bc3b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:16:51 +00:00
Kelly Rossmoyer
20b039192d
Revert "powerstats: timeout mechanism for AoC data provider"
...
Revert submission 17800080-power-stats-aoc-timeout
Reason for revert: Causing crashes due to improper thread sync
Reverted Changes:
I71a9e6817:powerstats: timeout mechanism for AoC data provide...
I725c00745:powerstats: set time limit as timeout for AoC
I5b290a53d:powerstats: set time limit as timeout for AoC
Change-Id: I6844a141739f93154d10debc29c7565f92349d25
2022-04-24 23:22:49 +00:00
Darren Hsu
83dbd42ded
powerstats: timeout mechanism for AoC data provider am: df08a31b76 am: db372c84a2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17800080
Change-Id: I92f008416831a92d6ba35d218c719573500428dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 04:57:55 +00:00
Darren Hsu
db372c84a2
powerstats: timeout mechanism for AoC data provider am: df08a31b76
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17800080
Change-Id: I4fb81f5673b918ce93991b020c3fa1d14bffc7b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 04:41:59 +00:00
Darren Hsu
df08a31b76
powerstats: timeout mechanism for AoC data provider
...
Reading data from an AoC sysfs node by getline takes 1 second. In total
there are 17 AoC sysfs nodes that must be read. The worst case is taking
17 seconds long that is greater than dumpsys timeout. Therefore, we need
the timeout mechanism to ignore the AoC power stats reporting when AoC
latency exceeds the allowed time.
Bug: 219630658
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I71a9e681780471f31141599c53bb516aef445add
Signed-off-by: Darren Hsu <darrenhsu@google.com>
2022-04-20 07:45:56 +00:00
Kelly Rossmoyer
c5ea1e89ff
Merge "Revert "powerstats: timeout mechanism for AoC data provider"" into tm-dev am: f19ccbfa65 am: f06abd3d8e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/17544418
Change-Id: I27ebc54450d6779f76a0b85118ffbf7ac9d2c828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 22:55:49 +00:00