Commit Graph

660896 Commits

Author SHA1 Message Date
TreeHugger Robot
cc3724e778 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4959acde34 -s ours am: 9d0657478b -s ours am: 78ea856c42 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340844

Change-Id: Idb449a9ae91e025dc5229867aeaeb25e268ae780
2021-07-21 13:20:43 +00:00
TreeHugger Robot
4ed735e558 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 18636927b7 -s ours am: 678227ea73 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340037

Change-Id: Ia771b138518aea87f32ad16c21cd7e3bff5d9baa
2021-07-21 13:20:37 +00:00
TreeHugger Robot
78ea856c42 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4959acde34 -s ours am: 9d0657478b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340844

Change-Id: I3dbf617c997c0d061dd64fe3fb0563eaeddd906d
2021-07-21 13:06:06 +00:00
TreeHugger Robot
678227ea73 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 18636927b7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340037

Change-Id: I0d933f51fb30104eebfa4d40378798aec5ea61ed
2021-07-21 13:06:02 +00:00
Beverly Tai
276952493f Merge "Reset messages when the keyguard isn't showing" into sc-dev am: fb4aa06b99 am: ecfac749e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15341139

Change-Id: I23961f2739c6ab28eda0f31fd9c2e5823ccbf0c4
2021-07-21 13:00:20 +00:00
TreeHugger Robot
a8c628116b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b64b9b2a62 -s ours am: 63ad597247 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15338503

Change-Id: I711466b07c39507ddfb6a131ca4f7a917f3ebabd
2021-07-21 13:00:01 +00:00
TreeHugger Robot
9d0657478b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4959acde34 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340844

Change-Id: I3e717b1925dc73cbc435ee44cd5f7390864d07c1
2021-07-21 12:59:06 +00:00
Beverly Tai
a6ba0961c0 Merge "Reset messages when the keyguard isn't showing" into sc-dev am: fb4aa06b99 am: 1f5bf69769
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15341139

Change-Id: Ibeb89d3d619d37fbc69ab95784b7dfa749afa5df
2021-07-21 12:56:59 +00:00
TreeHugger Robot
b80fa8bdf0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b64b9b2a62 -s ours am: 50e20bab88 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15338503

Change-Id: I35b2341fa1d0d65535d0d044b524a0d7b7602610
2021-07-21 12:55:51 +00:00
TreeHugger Robot
18636927b7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-21 12:54:44 +00:00
Beverly Tai
1f5bf69769 Merge "Reset messages when the keyguard isn't showing" into sc-dev am: fb4aa06b99
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15341139

Change-Id: Ia06458130d39fa37441c8ad67afb10304d2b32a7
2021-07-21 12:51:32 +00:00
Beverly Tai
ecfac749e8 Merge "Reset messages when the keyguard isn't showing" into sc-dev am: fb4aa06b99
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15341139

Change-Id: Ibe6c1d09a1862dd10a638197e8bc10ea9846a2db
2021-07-21 12:51:17 +00:00
TreeHugger Robot
50e20bab88 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b64b9b2a62 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15338503

Change-Id: I108aed7736415c906851f63806900f13d1ca7465
2021-07-21 12:51:11 +00:00
TreeHugger Robot
3b227f8e01 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 650177561b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340038

Change-Id: Ia183feed41f17e99bc71c2d9d0f9687f2203d1af
2021-07-21 12:51:04 +00:00
TreeHugger Robot
faaefa7a9a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6e3073c4f9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340847

Change-Id: I3c203bcb24e349cc313e2c4fb01115f7756c4d31
2021-07-21 12:50:54 +00:00
TreeHugger Robot
63ad597247 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b64b9b2a62 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15338503

Change-Id: I6f31cd6adc232ab64bfdc61e79b43e217722d899
2021-07-21 12:50:43 +00:00
TreeHugger Robot
d57f9a62f1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5afbf93938 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15341831

Change-Id: Ib45135ab03403528926224e08bdd45c42fac5ed6
2021-07-21 12:50:40 +00:00
TreeHugger Robot
4959acde34 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-07-21 12:48:43 +00:00
Beverly Tai
fb4aa06b99 Merge "Reset messages when the keyguard isn't showing" into sc-dev 2021-07-21 12:40:50 +00:00
TreeHugger Robot
b64b9b2a62 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-21 12:40:48 +00:00
TreeHugger Robot
650177561b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-21 12:40:41 +00:00
TreeHugger Robot
6e3073c4f9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-21 12:36:28 +00:00
TreeHugger Robot
5afbf93938 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-21 12:33:38 +00:00
Treehugger Robot
07a7cf045f [automerger skipped] Merge "Revert "Add systrace tag for system property"" am: 00e6e9cd26 -s ours am: 09adeddd2a -s ours am: a4ad343ea2 -s ours
am skip reason: Merged-In Id78992d238a73257bb9b80bfaa6bbfeb16f477d8 with SHA-1 7dc8bf4acf is already in history. Merged-In was found from reverted change.

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1767730

Change-Id: I4490460f98c8009ff10c4d3d2f984dddbdc13b90
2021-07-21 12:27:48 +00:00
Treehugger Robot
a4ad343ea2 [automerger skipped] Merge "Revert "Add systrace tag for system property"" am: 00e6e9cd26 -s ours am: 09adeddd2a -s ours
am skip reason: Merged-In Id78992d238a73257bb9b80bfaa6bbfeb16f477d8 with SHA-1 7dc8bf4acf is already in history. Merged-In was found from reverted change.

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1767730

Change-Id: Ib14493ee49e9bf9cfb2870aa9aaeadeb31f5ee18
2021-07-21 12:05:50 +00:00
Treehugger Robot
09adeddd2a [automerger skipped] Merge "Revert "Add systrace tag for system property"" am: 00e6e9cd26 -s ours
am skip reason: Merged-In Id78992d238a73257bb9b80bfaa6bbfeb16f477d8 with SHA-1 7dc8bf4acf is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1403551

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1767730

Change-Id: Ic750825ce2924d6ce85281da1ccad5005d9e0507
2021-07-21 11:56:23 +00:00
Treehugger Robot
00e6e9cd26 Merge "Revert "Add systrace tag for system property"" 2021-07-21 11:43:39 +00:00
Alex Florescu
80d9010787 Merge "Remove feature flag for split shade" into sc-v2-dev am: ad502315bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302106

Change-Id: I63c09330ba4cf27762e44f1b832ed68152ccfd53
2021-07-21 10:39:36 +00:00
Alex Florescu
ad502315bb Merge "Remove feature flag for split shade" into sc-v2-dev 2021-07-21 10:24:26 +00:00
TreeHugger Robot
04856073c1 [automerger skipped] Merge "More consistently retry system calls on EINTR" into sc-dev am: 84d34f9ce5 am: 2b9b70f9ff -s ours
am skip reason: Merged-In Icbfb38be5110607c121545e5c200ce65d1eefbfe with SHA-1 65fee3cfdc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15336435

Change-Id: I970a40d6ceabfd96e397f705d62463bbc5167d0a
2021-07-21 10:09:07 +00:00
TreeHugger Robot
2b9b70f9ff Merge "More consistently retry system calls on EINTR" into sc-dev am: 84d34f9ce5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15336435

Change-Id: Icf4276a6690e29ec873d804f2d919ea73c5ede2a
2021-07-21 09:46:05 +00:00
TreeHugger Robot
13241f64dd [automerger skipped] Merge "More consistently retry system calls on EINTR" into sc-dev am: 84d34f9ce5 -s ours am: 1c3ae12bbe -s ours
am skip reason: Merged-In Icbfb38be5110607c121545e5c200ce65d1eefbfe with SHA-1 c3dcb0d088 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15336435

Change-Id: Ibe178b7bd6372a11f4fcfe258bfab01c4a9e11ac
2021-07-21 09:46:05 +00:00
Treehugger Robot
e6e767caa9 Merge "profcollect: Add verbose logging for ota status updates" am: ac418218f8 am: c7c73d4ee1 am: eb1b047f7d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1773825

Change-Id: I722338b43c1320bf96bf07dc23828db89efbd166
2021-07-21 09:46:00 +00:00
TreeHugger Robot
1c3ae12bbe [automerger skipped] Merge "More consistently retry system calls on EINTR" into sc-dev am: 84d34f9ce5 -s ours
am skip reason: Merged-In Icbfb38be5110607c121545e5c200ce65d1eefbfe with SHA-1 c3dcb0d088 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15336435

Change-Id: I64b0f7e41a54d9c10e12a87875cc3fd3135cb7aa
2021-07-21 09:44:53 +00:00
Treehugger Robot
eb1b047f7d Merge "profcollect: Add verbose logging for ota status updates" am: ac418218f8 am: c7c73d4ee1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1773825

Change-Id: I366385185ad1ba6ab6e6f8c906e86aeae17ee187
2021-07-21 09:34:11 +00:00
TreeHugger Robot
84d34f9ce5 Merge "More consistently retry system calls on EINTR" into sc-dev 2021-07-21 09:33:30 +00:00
Treehugger Robot
c7c73d4ee1 Merge "profcollect: Add verbose logging for ota status updates" am: ac418218f8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1773825

Change-Id: I770aa3108932c27e83f113e37e3e6623d0b5954c
2021-07-21 09:22:47 +00:00
Issei Suzuki
9ea3dd96a0 Merge "Use intra wallaper transition animation for move to front/back transition." into sc-dev am: 398b9a8173 am: e54799d149
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302105

Change-Id: I0d4551d61888b7eed8e72e24546af0d1ba25c1f2
2021-07-21 09:07:45 +00:00
Issei Suzuki
ac7e7903c9 Merge "Use intra wallaper transition animation for move to front/back transition." into sc-dev am: 398b9a8173 am: d2e178f74d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302105

Change-Id: Icfa07f87bb1e504a99774808d4131e50f5289bfa
2021-07-21 09:07:28 +00:00
Treehugger Robot
ac418218f8 Merge "profcollect: Add verbose logging for ota status updates" 2021-07-21 09:07:02 +00:00
Issei Suzuki
d2e178f74d Merge "Use intra wallaper transition animation for move to front/back transition." into sc-dev am: 398b9a8173
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302105

Change-Id: I0597994a25ed043f8c0ed59fb2426d92cc3c4e6c
2021-07-21 08:57:12 +00:00
Issei Suzuki
e54799d149 Merge "Use intra wallaper transition animation for move to front/back transition." into sc-dev am: 398b9a8173
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302105

Change-Id: I75df22252591c0c5c8b906b52cd0244598f6cdd2
2021-07-21 08:56:05 +00:00
Issei Suzuki
398b9a8173 Merge "Use intra wallaper transition animation for move to front/back transition." into sc-dev 2021-07-21 08:39:32 +00:00
TreeHugger Robot
e7a852a6c6 [automerger skipped] Merge "Fix a potential NPE when allocating space for compressed apex" into sc-dev am: 607cadc918 -s ours am: b26ceedf90 -s ours
am skip reason: Merged-In I9357be8021e77fc8c3839f15a4a53c2a3c63cb13 with SHA-1 8ff9d439a0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15328970

Change-Id: Id4833a43e6f9feb7cc89f9cd9db0a44374ca1bc9
2021-07-21 08:01:21 +00:00
TreeHugger Robot
ca855b5818 [automerger skipped] Merge "ActivityManagerService: add new lmkd kill reason" into sc-dev am: c0ee8e009b -s ours am: 31391ff8d4 -s ours
am skip reason: Merged-In I5f86197865eb0353ef2c836ec9b2aeaae3bbf2ee with SHA-1 1b55247fbd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15327974

Change-Id: Ic398f9eb9175f4a5ac0ba65e186ccde1151d3a62
2021-07-21 08:01:12 +00:00
TreeHugger Robot
807a545d0e [automerger skipped] Merge "Fix a potential NPE when allocating space for compressed apex" into sc-dev am: 607cadc918 am: 314687f810 -s ours
am skip reason: Merged-In I9357be8021e77fc8c3839f15a4a53c2a3c63cb13 with SHA-1 8ff9d439a0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15328970

Change-Id: If67cce2d6e228d2d8ca387a7c2c4fd61590afc70
2021-07-21 08:01:01 +00:00
TreeHugger Robot
797012c81f [automerger skipped] Merge "ActivityManagerService: add new lmkd kill reason" into sc-dev am: c0ee8e009b am: 86d3bbb4cf -s ours
am skip reason: Merged-In I5f86197865eb0353ef2c836ec9b2aeaae3bbf2ee with SHA-1 1b55247fbd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15327974

Change-Id: I3c923a01f87ffb0ac0cd265978daeda9dc613aba
2021-07-21 08:00:48 +00:00
TreeHugger Robot
314687f810 Merge "Fix a potential NPE when allocating space for compressed apex" into sc-dev am: 607cadc918
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15328970

Change-Id: I191fead109858ebf38cff2cb11aa698ffdf92e4a
2021-07-21 07:47:31 +00:00
TreeHugger Robot
86d3bbb4cf Merge "ActivityManagerService: add new lmkd kill reason" into sc-dev am: c0ee8e009b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15327974

Change-Id: I94abcbe61fed5f473a5c0499649737f71278c61e
2021-07-21 07:47:03 +00:00
TreeHugger Robot
b26ceedf90 [automerger skipped] Merge "Fix a potential NPE when allocating space for compressed apex" into sc-dev am: 607cadc918 -s ours
am skip reason: Merged-In I9357be8021e77fc8c3839f15a4a53c2a3c63cb13 with SHA-1 8ff9d439a0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15328970

Change-Id: Ie095e73149f4b333155fe9deb9e371f297adc974
2021-07-21 07:46:22 +00:00