Bill Yi
e52ff0f68c
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-12-15 18:03:01 +00:00
Bill Yi
a6a1d6bb8e
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-12-15 18:03:01 +00:00
Bill Yi
e1bd80719e
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-12-15 18:03:01 +00:00
Bill Yi
0d02d9a34c
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-12-15 18:03:01 +00:00
Bill Yi
9858052d76
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-12-15 18:03:01 +00:00
Bill Yi
114847c6f4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3b4fcedd57a9598c25be1b9c14b34621482e0d8a
2022-12-14 17:52:57 -08:00
Bill Yi
43d355208b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia09899e46814f72a24c946d9cea8bbde88408da4
2022-12-14 17:47:37 -08:00
Bill Yi
afdcdd4c3c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie11e4cd7e4c18eca66203594b8a59945e6a5eda9
2022-12-14 17:40:17 -08:00
Bill Yi
23e8e206b5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I28ee983a8c20a2557c874120aca760769af9853b
2022-12-14 17:33:37 -08:00
Bill Yi
90bfb81e45
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I49529e2c9f38dd05dfb7da8b8191039e27eab687
2022-12-14 15:31:30 -08:00
Bill Yi
31fcb7dd46
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9218f77d25934d58687584c62f8165ae9284e275
2022-12-14 12:22:34 -08:00
Stefano Cianciulli
85bead9a77
Merge "Change ArtStatsLog.write() to report unknown uffd/minor fault support" into tm-mainline-prod
2022-12-13 13:35:54 +00:00
Aditya Gupta
dcfc636452
Merge "added benchmark for rubidium performance tests scripts Test: Ran atest RubidiumPerfTests and verified all new added tests are successful Bug: 261463071" into tm-mainline-prod
2022-12-13 10:30:37 +00:00
Terry Wang
e884b78d54
[automerger skipped] Merge "DO NOT MERGE:Deflaky testLoggingStats_search_success" into sc-dev am: d530cd1ad1 am: 393f374fe4 -s ours am: 7ba46d7f15 -s ours am: 7b6b4fecb9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20621276
Change-Id: I94714367cfcdb940c57eefcfe382005283f960c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-13 07:06:06 +00:00
Terry Wang
7b6b4fecb9
[automerger skipped] Merge "DO NOT MERGE:Deflaky testLoggingStats_search_success" into sc-dev am: d530cd1ad1 am: 393f374fe4 -s ours am: 7ba46d7f15 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20621276
Change-Id: Id2d38aa7ebc861e008a18132aa1f3e009abaa974
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-13 06:19:27 +00:00
Terry Wang
98fd9f4285
Merge changes from topic "presubmit-am-8134571e02a14812820dc4626241cf6f" into sc-qpr1-dev am: ba36fd90e3 am: 74dd009ae0 am: bacaccab9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20621276
Change-Id: I2ff9da660f86f424524585976505f70dc1ca5b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-13 05:51:34 +00:00
Presubmit Automerger Backend
ec30aa804f
[automerger skipped] [automerge] DO NOT MERGE:Deflaky testLoggingStats_search_success 2p: 2c01a0bb7e am: a85abd5775 -s ours am: 7f3dd285b5 -s ours am: 9d903936ea -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20621276
Change-Id: I2e41196acf8d2ce36730d98caca8d7b5c2557ebc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-13 05:51:32 +00:00
Terry Wang
a87bf629fd
[automerger skipped] Merge "DO NOT MERGE:Deflaky testLoggingStats_search_success" into sc-v2-dev am: b841118dac -s ours am: 05a7678c6f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20654518
Change-Id: Ibb95c633ecb6192254b7d2830916489f4c6d5814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-13 05:51:05 +00:00
Terry Wang
4243491f03
[automerger skipped] DO NOT MERGE:Deflaky testLoggingStats_search_success am: f3602f993a -s ours am: 49ae1011d5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20654518
Change-Id: I1fd299dfef11bb479c235c3c5c16b8f49f371ab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-13 05:51:02 +00:00
Terry Wang
7ba46d7f15
[automerger skipped] Merge "DO NOT MERGE:Deflaky testLoggingStats_search_success" into sc-dev am: d530cd1ad1 am: 393f374fe4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20621276
Change-Id: Id98d7c5fc4e2f2aa01977b9754adca35de8ed2c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-13 05:46:31 +00:00
Terry Wang
bacaccab9d
Merge changes from topic "presubmit-am-8134571e02a14812820dc4626241cf6f" into sc-qpr1-dev am: ba36fd90e3 am: 74dd009ae0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20621276
Change-Id: Ic0e7af2ad805b430741112568cd449fccd0d8147
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-13 05:44:01 +00:00
Presubmit Automerger Backend
9d903936ea
[automerger skipped] [automerge] DO NOT MERGE:Deflaky testLoggingStats_search_success 2p: 2c01a0bb7e am: a85abd5775 -s ours am: 7f3dd285b5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20621276
Change-Id: I9b830f1b5b5b1e6f7eeebb894f9d98c3e934847a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-13 05:43:17 +00:00
Terry Wang
393f374fe4
Merge "DO NOT MERGE:Deflaky testLoggingStats_search_success" into sc-dev am: d530cd1ad1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20621276
Change-Id: Ia4c2e9e67a24e962621c426b044583592c926de2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-13 05:11:18 +00:00
Terry Wang
74dd009ae0
Merge changes from topic "presubmit-am-8134571e02a14812820dc4626241cf6f" into sc-qpr1-dev am: ba36fd90e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20621276
Change-Id: Iaeed0a429ef397aed1900e0e88d73679dd80f66f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-13 05:10:48 +00:00
Presubmit Automerger Backend
7f3dd285b5
[automerger skipped] [automerge] DO NOT MERGE:Deflaky testLoggingStats_search_success 2p: 2c01a0bb7e am: a85abd5775 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20621276
Change-Id: I27de64eba81e7f640e180e30bb3c634d58943e90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-13 05:10:34 +00:00
Terry Wang
05a7678c6f
[automerger skipped] Merge "DO NOT MERGE:Deflaky testLoggingStats_search_success" into sc-v2-dev am: b841118dac -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20654518
Change-Id: Ia37b521ff4a01cd7b7609b2276975a453f9103b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-13 05:06:55 +00:00
Terry Wang
49ae1011d5
[automerger skipped] DO NOT MERGE:Deflaky testLoggingStats_search_success am: f3602f993a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20654518
Change-Id: Idf5288b7cd9217deb26e67349d073538a5ca1532
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-13 05:06:29 +00:00
Terry Wang
ba36fd90e3
Merge changes from topic "presubmit-am-8134571e02a14812820dc4626241cf6f" into sc-qpr1-dev
...
* changes:
[automerge] DO NOT MERGE:Deflaky testLoggingStats_search_success 2p: 2c01a0bb7e
DO NOT MERGE:Deflaky testLoggingStats_search_success
2022-12-13 04:37:33 +00:00
Terry Wang
d530cd1ad1
Merge "DO NOT MERGE:Deflaky testLoggingStats_search_success" into sc-dev
2022-12-13 04:37:33 +00:00
Terry Wang
b841118dac
Merge "DO NOT MERGE:Deflaky testLoggingStats_search_success" into sc-v2-dev
2022-12-13 04:37:20 +00:00
Bill Yi
f00ed0eea1
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-12-10 04:36:41 +00:00
Bill Yi
1058ab1816
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-12-10 04:36:41 +00:00
Bill Yi
1c0dd3e233
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-12-10 04:36:41 +00:00
Bill Yi
71541e0135
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-12-10 04:36:41 +00:00
TreeHugger Robot
344736c305
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-12-09 18:24:17 +00:00
Alessandra Loro
929b30e27f
Merge "Add READ_MEDIA_VISUAL_USER_SELECTED permission and appop" into tm-mainline-prod
2022-12-09 12:43:09 +00:00
Stefano Cianciulli
bea88098d7
Change ArtStatsLog.write() to report unknown uffd/minor fault support
...
Bug: 249772734
Test: atest ArtGtestsTargetChroot
Change-Id: I8e95ebeaeccefcf95dc18fa0934927b0069a6f3f
(cherry picked from commit 751970ce80 )
Merged-In: I8e95ebeaeccefcf95dc18fa0934927b0069a6f3f
2022-12-09 09:38:02 +00:00
Hassan Ali
076321e6e7
Add framework-configinfrastructure.stubs lib
...
A temporary solution to add framework-configinfrastructure stubs java lib
until we add configinfrastructure module to AOSP.
This change will enable us to add framework-configinfrastructure as a
dependency to other modules.
Test: m
Merged-In: I85bd435fb95c7ee6c641cb6679affa9026cf4220
Change-Id: I504b1be870003c0a1a785ab04c04a737f77d33fb
2022-12-08 14:17:24 +00:00
Bill Yi
732907ec40
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibcd24d79e9a1ec27d264612ba04f6a89748a4eb7
2022-12-08 06:03:39 -08:00
Bill Yi
d621f707c0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie302e934f087981b6c4775bb52dfcd15b92bfc78
2022-12-08 05:58:45 -08:00
Bill Yi
843ff13a78
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id50af96d4ede982f63ff7ed354d0f811d4955018
2022-12-08 05:45:47 -08:00
Aditya Gupta
ed79aa71af
added benchmark for rubidium performance tests scripts
...
Test: Ran atest RubidiumPerfTests and verified all new added tests are
successful
Bug: 261463071
Change-Id: I2c0166533fb0ced3bf4cbd4c4a1c091f2a41123f
2022-12-08 13:24:24 +00:00
Bill Yi
e2a89a0115
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic29d133c2d14b929ccae0a846662752de405ee24
2022-12-08 03:51:16 -08:00
Bill Yi
03ffb10fee
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icb7d7948e743e39d5e03388a3b0a30d0b2a77514
2022-12-08 00:51:01 -08:00
Jing Ji
56d391033c
[automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-qpr-dev am: 95907cfca2 -s ours am: d577c51c3d -s ours am: f684abcd18 -s ours am: 64da92499e -s ours am: e166e03ed3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20322505
Change-Id: I8d48c837b773558dce8b36d6e0c6965d7266a7a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 05:07:50 +00:00
Jing Ji
d8a8d74298
[automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 0b75cda3c2 -s ours am: 7fe7416e79 -s ours am: a41bf91d53 -s ours am: c22b698208 -s ours am: 1e076760e6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20322505
Change-Id: I60384475e62bfb86bf0d467a2aa98c6223e7f49a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 05:07:45 +00:00
Pinyao Ting
1bf12f380f
[conflict] Merge "Implement a global maximum on number of shortcuts an app can publish" into rvc-dev am: 584d18790a am: f9a6a136a0 am: bb4ff2e484 am: eee3312ac2 am: 4611aa5717 am: 69042ba58f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20671668
Change-Id: I876efc00a31f2edee1f6ea384806acf5f31a3b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 05:07:23 +00:00
Jing Ji
e166e03ed3
[automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-qpr-dev am: 95907cfca2 -s ours am: d577c51c3d -s ours am: f684abcd18 -s ours am: 64da92499e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20322505
Change-Id: Iff4d9d46893895e81905be7c50b65375c318ee2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 04:37:16 +00:00
Jing Ji
1e076760e6
[automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 0b75cda3c2 -s ours am: 7fe7416e79 -s ours am: a41bf91d53 -s ours am: c22b698208 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20322505
Change-Id: I4044aa7ce2ac16a5ca65253f77418985d53ade94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 04:36:32 +00:00
Pinyao Ting
69042ba58f
[conflict] Merge "Implement a global maximum on number of shortcuts an app can publish" into rvc-dev am: 584d18790a am: f9a6a136a0 am: bb4ff2e484 am: eee3312ac2 am: 4611aa5717
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20671668
Change-Id: I9c8cc614d89d1405d922781a5cd7ce6ea12db053
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 04:35:40 +00:00