80 Commits

Author SHA1 Message Date
Adam Shih
9dc990df6c create a folder for pixel sepolicy operations am: 067c78bea9 am: acd6d2fa62
Original change: https://android-review.googlesource.com/c/device/google/gs-common/+/2585245

Change-Id: I7a18bd439f24772e337c3370e2bc6196deb94972
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 08:21:04 +00:00
Adam Shih
acd6d2fa62 create a folder for pixel sepolicy operations am: 067c78bea9
Original change: https://android-review.googlesource.com/c/device/google/gs-common/+/2585245

Change-Id: I25c705f4a20477c60277cfcf5014c2ff7ed04989
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 07:42:44 +00:00
Adam Shih
067c78bea9 create a folder for pixel sepolicy operations
Bug: 281631102
Test: N/A
Change-Id: I1f7e9b211ef1390c7948aaf6c690a175b4097a4b
2023-05-10 01:44:25 +00:00
Xin Li
e076e37a7b [automerger skipped] Merge Android 13 QPR2 am: aabe581b77 -s ours am: 44487f06ed -s ours
am skip reason: Merged-In Ia4041e10156eadb37799ebdc12b33fbb3de4c54d with SHA-1 c010e721ea is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs-common/+/2486781

Change-Id: Ie650cd3e3da45a3ac8c7005baa498dff102c7a5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:06:03 +00:00
Xin Li
44487f06ed [automerger skipped] Merge Android 13 QPR2 am: aabe581b77 -s ours
am skip reason: Merged-In Ia4041e10156eadb37799ebdc12b33fbb3de4c54d with SHA-1 c010e721ea is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs-common/+/2486781

Change-Id: I3a6e41258bee7ff50e05d187be53d6192572d88d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:32:06 +00:00
Xin Li
aabe581b77 Merge Android 13 QPR2
Bug: 273316506
Merged-In: Ia4041e10156eadb37799ebdc12b33fbb3de4c54d
Change-Id: I5c3c3879f5d20a706d1f12ec90f580d1f441ee54
2023-03-13 23:09:32 -07:00
Xin Li
c71ebeb4bc [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 0725b4c5fd -s ours
am skip reason: Merged-In Ia4041e10156eadb37799ebdc12b33fbb3de4c54d with SHA-1 c010e721ea is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/20947041

Change-Id: I866128a579fe5735771b53c4a5f902119bb991a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 08:08:03 +00:00
Xin Li
0725b4c5fd Merge tm-qpr-dev-plus-aosp-without-vendor@9467136
Bug: 264720040
Merged-In: Ia4041e10156eadb37799ebdc12b33fbb3de4c54d
Change-Id: I84ee1eacd23193d4bd40d6e2e74afc424fa57668
2023-01-11 22:46:17 -08:00
Darren Hsu
03bc2cf0c1 powerstats: add OWNERS for power stats am: 7885d61cd4 am: 6230c14fe5
Original change: https://android-review.googlesource.com/c/device/google/gs-common/+/2375575

Change-Id: I1ee1a4b8068c7b9bf6ad8596c23ff70ea4a16ca3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-09 08:08:48 +00:00
Darren Hsu
6230c14fe5 powerstats: add OWNERS for power stats am: 7885d61cd4
Original change: https://android-review.googlesource.com/c/device/google/gs-common/+/2375575

Change-Id: Id04a3d47774ade828a7ea0c8c834a225f1669e6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-09 07:34:17 +00:00
Darren Hsu
7885d61cd4 powerstats: add OWNERS for power stats
Bug: 264815906
Test: N/A
Change-Id: I7962429126547b974bdc3133b00b49624a94959c
Signed-off-by: Darren Hsu <darrenhsu@google.com>
2023-01-09 10:43:10 +08:00
Automerger Merge Worker
8e3ffe07f5 Merge "[automerger skipped] Merge Android 13 QPR1 am: cbe92d054f -s ours" into stage-aosp-master am: c4a85b818b -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: I99dcd666dcee8fdeca7885005375427b505784e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 01:59:36 +00:00
Xin Li
2e841fb1da [automerger skipped] Merge Android 13 QPR1 am: cbe92d054f -s ours am: 28139d44f1 -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: I01a65938928d4d7864575b9153a27457bedf28f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 01:57:16 +00:00
Xin Li
3368b3db80 [automerger skipped] Merge Android 13 QPR1 am: cbe92d054f -s ours am: a4669a71e7 -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: Ie92f53a891cbaccec6bc6c26384b09f2e5ceb98e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 00:24:37 +00:00
Automerger Merge Worker
c4a85b818b Merge "[automerger skipped] Merge Android 13 QPR1 am: cbe92d054f -s ours" into stage-aosp-master 2022-12-09 23:28:07 +00:00
Xin Li
28139d44f1 [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: Ie8f288c96cf1f6c143e456c2a5f89fe97813f8a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 23:19:14 +00:00
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
Bowgo Tsai
772f4a3bae Adding developer GSI keys am: c010e721ea
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/20265094

Change-Id: I17bbf55cbc98afee24ad12b9b0c9fe18114ae887
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-25 16:50:10 +00:00
Bowgo Tsai
c010e721ea Adding developer GSI keys
Bug: 254752713
Test: build and check $OUT/installed-files-vendor-ramdisk.txt that GSI
      keys are included
Change-Id: Ia4041e10156eadb37799ebdc12b33fbb3de4c54d
Merged-In: Ia4041e10156eadb37799ebdc12b33fbb3de4c54d
(cherry picked from commit c42b5e2fc5e9eeb2aee93b211b8cf2985a913930)
2022-10-25 15:58:38 +08:00
Xin Li
bf5b42acd8 [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 8d040eaa88 -s ours
am skip reason: Merged-In Iad7403dcbc0ad12b77154003f4aa61afedf2224f with SHA-1 edf8707658 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/20132575

Change-Id: Ia5d9d6b8a307936ad57749bf9cc6a00a6360860f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 17:55:41 +00: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
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
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
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
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
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
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