Commit Graph

654180 Commits

Author SHA1 Message Date
Jayant Chowdhary
3c93e01ccf Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15121727

Change-Id: I1adb4fa9ae369c1eabbd3fcbdac7abf4425743bb
2021-08-09 15:30:32 +00:00
Jayant Chowdhary
0cf6fdb791 Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15121727

Change-Id: Id144b968bf5154f806900e030d2b7bd9ba407c67
2021-08-09 15:20:58 +00:00
Jayant Chowdhary
93e157955a Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev 2021-08-09 15:12:22 +00:00
Derek Sollenberger
b94d50a689 Merge "CanvasContext::draw: flushAndSubmit when not drawing" into sc-dev am: 1171be085c am: 973eac4b05
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15481327

Change-Id: Ic88589047f3723b43b5b8b50af673f9f66fff501
2021-08-09 13:21:47 +00:00
Derek Sollenberger
9ffe9ed76c Merge "CanvasContext::draw: flushAndSubmit when not drawing" into sc-dev am: 1171be085c am: f832270a85
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15481327

Change-Id: Ifa1f36f173e02a657776eca2741672280e335e19
2021-08-09 13:10:37 +00:00
Derek Sollenberger
973eac4b05 Merge "CanvasContext::draw: flushAndSubmit when not drawing" into sc-dev am: 1171be085c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15481327

Change-Id: Ib93701690a3333a4ee54ea1cdc4ad5e48ab52259
2021-08-09 13:02:08 +00:00
Derek Sollenberger
f832270a85 Merge "CanvasContext::draw: flushAndSubmit when not drawing" into sc-dev am: 1171be085c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15481327

Change-Id: I4af7f9ddde1273db6aefed5f14fdcaf2d8df36ec
2021-08-09 13:01:12 +00:00
Derek Sollenberger
1171be085c Merge "CanvasContext::draw: flushAndSubmit when not drawing" into sc-dev 2021-08-09 12:45:07 +00:00
Rhed Jao
dcfd49f395 [automerger skipped] Merge "DO NOT MERGE Apply a maximum char count to the load label api" into sc-dev am: 97ff8e3eed -s ours am: fa5618ca66 -s ours
am skip reason: Merged-In Ia4d768cc93a47cfb8b6f7c4b6dc73abd801809bd with SHA-1 b55d314f46 is already in history

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

Change-Id: I73ce863fa16387ff4530417f5aff805429f5b555
2021-08-09 11:45:04 +00:00
Rhed Jao
911cf2d31a [automerger skipped] Merge "DO NOT MERGE Apply a maximum char count to the load label api" into sc-dev am: 97ff8e3eed -s ours am: 56d090cf08 -s ours
am skip reason: Merged-In Ia4d768cc93a47cfb8b6f7c4b6dc73abd801809bd with SHA-1 b55d314f46 is already in history

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

Change-Id: Ife556f2182bbf67ba56cb5bcb836867b430e53f4
2021-08-09 11:44:48 +00:00
Rhed Jao
fa5618ca66 [automerger skipped] Merge "DO NOT MERGE Apply a maximum char count to the load label api" into sc-dev am: 97ff8e3eed -s ours
am skip reason: Merged-In Ia4d768cc93a47cfb8b6f7c4b6dc73abd801809bd with SHA-1 b55d314f46 is already in history

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

Change-Id: I01d8064e1e4e4f8eefaadd9656067140ff018ccb
2021-08-09 11:31:20 +00:00
Rhed Jao
56d090cf08 [automerger skipped] Merge "DO NOT MERGE Apply a maximum char count to the load label api" into sc-dev am: 97ff8e3eed -s ours
am skip reason: Merged-In Ia4d768cc93a47cfb8b6f7c4b6dc73abd801809bd with SHA-1 b55d314f46 is already in history

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

Change-Id: I7bad8b1d1adfa720bf276750bc7591674e248072
2021-08-09 11:30:36 +00:00
Rhed Jao
97ff8e3eed Merge "DO NOT MERGE Apply a maximum char count to the load label api" into sc-dev 2021-08-09 10:48:39 +00:00
Automerger Merge Worker
abf186350e Merge "[automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours am: d5b3601177 -s ours am: 2159ba8c04 -s ours am: 0f553a5f64 -s ours am: be3551edad -s ours am: 1fabf50d78 -s ours am: 49c8cdb84d -s ours am: dff63c5737 -s ours" into sc-qpr1-dev-plus-aosp 2021-08-09 09:30:59 +00:00
Rhed Jao
c0ddb4746e [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours am: d5b3601177 -s ours am: 2159ba8c04 -s ours am: 0f553a5f64 -s ours am: be3551edad -s ours am: 1fabf50d78 -s ours am: 49c8cdb84d -s ours am: dff63c5737 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I747e1138af8d9c2fe5d66e4db0f4d35e830872d0
2021-08-09 09:30:44 +00:00
Automerger Merge Worker
57d77132d6 Merge "[automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours am: d5b3601177 -s ours am: 2159ba8c04 -s ours am: 0f553a5f64 -s ours am: be3551edad -s ours am: 1fabf50d78 -s ours am: 49c8cdb84d -s ours am: 33e59f34b0 -s ours" into sc-qpr1-dev-plus-aosp 2021-08-09 09:30:41 +00:00
Rhed Jao
2f0d2eeab4 [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: b55d314f46 -s ours am: 8cd4647906 -s ours am: 96254f92a5 -s ours am: 576965b06d -s ours am: 357f63a381 -s ours am: 3b3fa55d72 -s ours am: e217e37981 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3accccd6d20b0dc410e1787a6f2337cfee50f780
2021-08-09 09:30:33 +00:00
Rhed Jao
668ffe8265 [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours am: d5b3601177 -s ours am: 2159ba8c04 -s ours am: 0f553a5f64 -s ours am: be3551edad -s ours am: 1fabf50d78 -s ours am: 49c8cdb84d -s ours am: 33e59f34b0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib3129bc33bbb26f54c7fcb1d377303b2c28aa331
2021-08-09 09:30:27 +00:00
Rhed Jao
cc92859ad5 [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours am: d5b3601177 -s ours am: 2159ba8c04 -s ours am: 0f553a5f64 -s ours am: be3551edad -s ours am: bd8b271f2a -s ours am: 3d011ccfd4 -s ours am: 78310668c8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I16cd091826df67dc5a4940aea52852714d29b90d
2021-08-09 09:30:24 +00:00
Rhed Jao
551ef5d19d [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: b55d314f46 -s ours am: 8cd4647906 -s ours am: 96254f92a5 -s ours am: 576965b06d -s ours am: 357f63a381 -s ours am: 3b3fa55d72 -s ours am: 818338b60c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I296844816ac3a76bc2d156700e36b9ca1f9800f1
2021-08-09 09:30:18 +00:00
Automerger Merge Worker
42057af3e7 Merge "[automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: b55d314f46 -s ours am: 8cd4647906 -s ours am: 96254f92a5 -s ours am: 576965b06d -s ours am: b4b5f78073 -s ours am: 92f4038734 -s ours am: c73aeac541 -s ours" into sc-qpr1-dev-plus-aosp 2021-08-09 09:30:17 +00:00
Rhed Jao
1f634bea30 [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours am: d5b3601177 -s ours am: 2159ba8c04 -s ours am: 0f553a5f64 -s ours am: be3551edad -s ours am: bd8b271f2a -s ours am: 3d011ccfd4 -s ours am: 7b9f10fb35 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic604b650b56a1a1539e65ee7307e25e6304c7c87
2021-08-09 09:30:11 +00:00
Rhed Jao
f392b4c8aa [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: b55d314f46 -s ours am: 8cd4647906 -s ours am: 96254f92a5 -s ours am: 576965b06d -s ours am: b4b5f78073 -s ours am: 92f4038734 -s ours am: c73aeac541 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8ccdc493fc7a058d87d3aca63c838d199c825542
2021-08-09 09:30:10 +00:00
Rhed Jao
11d6af65e4 [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: b55d314f46 -s ours am: 8cd4647906 -s ours am: 96254f92a5 -s ours am: 576965b06d -s ours am: b4b5f78073 -s ours am: 92f4038734 -s ours am: a69d15b71b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib800949ac4abaf63ec18e3ceaf2c2444dd5f9cda
2021-08-09 09:30:01 +00:00
Rhed Jao
dff63c5737 [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours am: d5b3601177 -s ours am: 2159ba8c04 -s ours am: 0f553a5f64 -s ours am: be3551edad -s ours am: 1fabf50d78 -s ours am: 49c8cdb84d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id09d02ee7ce4d9b9de64303f15e95d4de9080420
2021-08-09 09:09:50 +00:00
Rhed Jao
e217e37981 [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: b55d314f46 -s ours am: 8cd4647906 -s ours am: 96254f92a5 -s ours am: 576965b06d -s ours am: 357f63a381 -s ours am: 3b3fa55d72 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0ed6e1ccae927f246be4276edf3b23dc2196c5bf
2021-08-09 09:09:43 +00:00
Rhed Jao
78310668c8 [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours am: d5b3601177 -s ours am: 2159ba8c04 -s ours am: 0f553a5f64 -s ours am: be3551edad -s ours am: bd8b271f2a -s ours am: 3d011ccfd4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I800d24f3daf402540185429018e18219b12ee08b
2021-08-09 09:09:35 +00:00
Rhed Jao
c73aeac541 [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: b55d314f46 -s ours am: 8cd4647906 -s ours am: 96254f92a5 -s ours am: 576965b06d -s ours am: b4b5f78073 -s ours am: 92f4038734 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6c911f00b90384a0dd9cf8e752d976cd21f6b98a
2021-08-09 09:09:27 +00:00
Rhed Jao
33e59f34b0 [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours am: d5b3601177 -s ours am: 2159ba8c04 -s ours am: 0f553a5f64 -s ours am: be3551edad -s ours am: 1fabf50d78 -s ours am: 49c8cdb84d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I929b60ca18d5eac60f0ab5e405462da0ac658823
2021-08-09 09:09:20 +00:00
Rhed Jao
818338b60c [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: b55d314f46 -s ours am: 8cd4647906 -s ours am: 96254f92a5 -s ours am: 576965b06d -s ours am: 357f63a381 -s ours am: 3b3fa55d72 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8a104df8b1edf8ccaffc48ef06dd47fa270a4c40
2021-08-09 09:09:11 +00:00
Rhed Jao
7b9f10fb35 [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours am: d5b3601177 -s ours am: 2159ba8c04 -s ours am: 0f553a5f64 -s ours am: be3551edad -s ours am: bd8b271f2a -s ours am: 3d011ccfd4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibd822d91900036a03ab3ae1ddfd616242917d2f3
2021-08-09 09:09:01 +00:00
Rhed Jao
a69d15b71b [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: b55d314f46 -s ours am: 8cd4647906 -s ours am: 96254f92a5 -s ours am: 576965b06d -s ours am: b4b5f78073 -s ours am: 92f4038734 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iff25ae1e001913596c7c438098ac5029ff70aaef
2021-08-09 09:08:51 +00:00
Rhed Jao
49c8cdb84d [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours am: d5b3601177 -s ours am: 2159ba8c04 -s ours am: 0f553a5f64 -s ours am: be3551edad -s ours am: 1fabf50d78 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I98bc61f32ee8f75c63f86f35a36c074b88130078
2021-08-09 08:55:12 +00:00
Rhed Jao
3b3fa55d72 [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: b55d314f46 -s ours am: 8cd4647906 -s ours am: 96254f92a5 -s ours am: 576965b06d -s ours am: 357f63a381 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9e520cc5c492397b0ab53ccdce52529e1eec3f87
2021-08-09 08:54:37 +00:00
Rhed Jao
3d011ccfd4 [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours am: d5b3601177 -s ours am: 2159ba8c04 -s ours am: 0f553a5f64 -s ours am: be3551edad -s ours am: bd8b271f2a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ida1618f933672bf0a14c0f82011521ef323c0a14
2021-08-09 08:54:07 +00:00
Rhed Jao
92f4038734 [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: b55d314f46 -s ours am: 8cd4647906 -s ours am: 96254f92a5 -s ours am: 576965b06d -s ours am: b4b5f78073 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I470464e264e1768b591afa0dcfd6760f9994dbed
2021-08-09 08:53:41 +00:00
Rhed Jao
1fabf50d78 [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours am: d5b3601177 -s ours am: 2159ba8c04 -s ours am: 0f553a5f64 -s ours am: be3551edad -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6ea80d94f67db60a422218c1ea3772e050819641
2021-08-09 08:42:28 +00:00
Rhed Jao
357f63a381 [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: b55d314f46 -s ours am: 8cd4647906 -s ours am: 96254f92a5 -s ours am: 576965b06d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6089211f1e5e21a40c81d78bab4168b92153dc12
2021-08-09 08:42:22 +00:00
Rhed Jao
bd8b271f2a [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours am: d5b3601177 -s ours am: 2159ba8c04 -s ours am: 0f553a5f64 -s ours am: be3551edad -s ours
am skip reason: subject contains skip directive

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

Change-Id: I51a276f103296068e75143f1e3b019dd0a51ef32
2021-08-09 08:42:21 +00:00
Rhed Jao
b4b5f78073 [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: b55d314f46 -s ours am: 8cd4647906 -s ours am: 96254f92a5 -s ours am: 576965b06d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie7011056f45d8e79619c6d33d5cf42852867c929
2021-08-09 08:42:15 +00:00
Rhed Jao
be3551edad [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours am: d5b3601177 -s ours am: 2159ba8c04 -s ours am: 0f553a5f64 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4b111020f744352b96f9efb282bdd382d6d70969
2021-08-09 08:29:03 +00:00
Rhed Jao
576965b06d [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: b55d314f46 -s ours am: 8cd4647906 -s ours am: 96254f92a5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5af44fd797016e20eaf936ccc9ce2b41ce8dc0a6
2021-08-09 08:28:38 +00:00
Rhed Jao
0f553a5f64 [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours am: d5b3601177 -s ours am: 2159ba8c04 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1dd2d666977647ea2051483dec7b47730dbfdae1
2021-08-09 08:11:39 +00:00
Rhed Jao
96254f92a5 [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: b55d314f46 -s ours am: 8cd4647906 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4a5ee088ae4b68c695d6c6a3f93034176d8f06eb
2021-08-09 08:11:10 +00:00
Rhed Jao
2159ba8c04 [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours am: d5b3601177 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I05098a0d0a5a0d3dc97a8788358febcd5d4ad7b8
2021-08-09 07:46:15 +00:00
Rhed Jao
8cd4647906 [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: b55d314f46 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I149a6db2a8594e7d3a6f9a64782c7dd44654ca3c
2021-08-09 07:45:56 +00:00
Rhed Jao
d5b3601177 [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieadb3841c95274b877281caaef777273e1592e14
2021-08-09 07:45:08 +00:00
Jiakai Zhang
e1a6e5e53b Merge "Disable JIT in BootImageProfileTest." am: 89320ec08f am: 3e8f4a285c am: 2b3b5e27ec
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1781192

Change-Id: Ie3924e303f1d0ad8e935e26e7a958cfbe4d8a974
2021-08-09 06:44:37 +00:00
Jiakai Zhang
2b3b5e27ec Merge "Disable JIT in BootImageProfileTest." am: 89320ec08f am: 3e8f4a285c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1781192

Change-Id: I495428c47a8ae41588380a4395d994772a761c44
2021-08-09 06:31:07 +00:00
Jiakai Zhang
3e8f4a285c Merge "Disable JIT in BootImageProfileTest." am: 89320ec08f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1781192

Change-Id: I7bba0531a1887b3984aca6489351d3b9ca763014
2021-08-09 06:13:45 +00:00