Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
707,971 Commits 3 Branches 0 Tags
92aa9daa10ba767cccead3b875d1251dcf2a2a6b
Commit Graph

707971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ady Abraham
92aa9daa10 Revert "Implement dynamic colors for boot animation." 
This reverts commit 79d079ea49.

Reason for revert: DroidMonitor: Potential culprit for Bug b/196456395 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: I6130e75ae174f68ddfaa6e1010d7979538311020
 2021-08-12 23:55:46 +00:00
Shan Huang
79d079ea49 Implement dynamic colors for boot animation. 
This CL won't cause any visual change to the boot animation yet
because the asset zips are yet to be udated.

Next steps:
- Update format.md to include documentation for dynamic coloring.
- Update asset zip files.

Test: Manual
Bug: 190093578

Change-Id: I63fdb1983896f321288d595d06f46bcde7da1aab
 2021-08-12 19:10:30 +00:00
Josh Yang
a9d207945e Merge "Allow ActivityOptions remote animation override per-display remote animation." 2021-08-09 17:31:38 +00:00
Jayant Chowdhary
49f2c7c5d1 [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: b31822b392 -s ours am: df1723afdf -s ours am: 020f357bc9 -s ours am: fbd41cbe7a -s ours am: 657355080a -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history

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

Change-Id: Ibfe34492e769bf4c765c9991d17f46b89f9ff35d
 2021-08-09 16:48:08 +00:00
Jayant Chowdhary
2624a3a96c [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: 9e82fb98ed -s ours am: 1a17ae5c9b -s ours am: 2db515e1ec -s ours am: 9523e06fed -s ours am: 70244bce62 -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 6b0bcd60c8 is already in history

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

Change-Id: Ifda4476ed0b86d86ef120ff704f2c45058f08942
 2021-08-09 16:47:58 +00:00
Kurt Dresner
3f5cba7c40 Merge "Allow cross-user use of projection state APIs." into sc-v2-dev am: 9907453f3a am: 6acd5a17d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15463552

Change-Id: Ibe6b8189bb6dfdb69e229faa9588d7e8b2ee3cbb
 2021-08-09 16:47:38 +00:00
Jayant Chowdhary
edec3b44eb [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: b31822b392 -s ours am: df1723afdf -s ours am: 020f357bc9 -s ours am: c4a7666a7c -s ours am: 04bf5e61fb -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history

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

Change-Id: I20d922dee3150c0181f43a139c727f7ecff93e94
 2021-08-09 16:46:51 +00:00
Jayant Chowdhary
6a4d4d8056 [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: 9e82fb98ed -s ours am: 1a17ae5c9b -s ours am: 2db515e1ec -s ours am: cfb14e7770 -s ours am: 811c886bab -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 6b0bcd60c8 is already in history

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

Change-Id: I738bfa08d4cb8e13dda333ea5af033b108301d78
 2021-08-09 16:46:40 +00:00
Jayant Chowdhary
3ac54ab7c3 [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: b31822b392 -s ours am: df1723afdf -s ours am: 8b405b2c5f -s ours am: 6e391f8afa -s ours am: b80ff54c06 -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history

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

Change-Id: I133b054b4a898d32ac93cec7ead6244a7cce19f3
 2021-08-09 16:46:28 +00:00
Jayant Chowdhary
4f1b685d8b [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: 9e82fb98ed -s ours am: 1a17ae5c9b -s ours am: e5b26966c1 -s ours am: fdb5e86af7 -s ours am: fda3b5a3a7 -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 6b0bcd60c8 is already in history

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

Change-Id: Ic91fa7eb9fa12f00acf23452d00d27a560c6c2bb
 2021-08-09 16:46:09 +00:00
Jayant Chowdhary
657355080a [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: b31822b392 -s ours am: df1723afdf -s ours am: 020f357bc9 -s ours am: fbd41cbe7a -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history

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

Change-Id: I03c505aebf34c4138616f9258941e925953d0536
 2021-08-09 16:45:58 +00:00
Derek Sollenberger
325a19b5c7 Merge "CanvasContext::draw: flushAndSubmit when not drawing" into sc-dev am: 1171be085c am: 973eac4b05 am: b94d50a689 am: 746eb921df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15481327

Change-Id: I80e43ddd18faf30d5d498f9e071a76e4368ab1ac
 2021-08-09 16:45:52 +00:00
Jayant Chowdhary
70244bce62 [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: 9e82fb98ed -s ours am: 1a17ae5c9b -s ours am: 2db515e1ec -s ours am: 9523e06fed -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 6b0bcd60c8 is already in history

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

Change-Id: I6ac4e6e47dd8c7851b79d07c967051c18db37452
 2021-08-09 16:45:50 +00:00
Kurt Dresner
6acd5a17d7 Merge "Allow cross-user use of projection state APIs." into sc-v2-dev am: 9907453f3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15463552

Change-Id: I7d0abf75c74b7a4bfeaa9b49d8af89cd57917736
 2021-08-09 16:45:00 +00:00
Derek Sollenberger
144b7b6e7f Merge "CanvasContext::draw: flushAndSubmit when not drawing" into sc-dev am: 1171be085c am: f832270a85 am: 9ffe9ed76c am: 6a14a93277 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15481327

Change-Id: I3d4cec406a07e9c069b52dac62012ebaa5557de8
 2021-08-09 16:44:54 +00:00
Jeff Sharkey
c85227699e Merge "Omit links for custom ErrorProne checkers." 2021-08-09 16:40:53 +00:00
Rhed Jao
c2c52e9884 [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: dcfd49f395 -s ours am: 998bab10f0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icb6940fb90e4e91ace8b125f445ca6402eb7e8da
 2021-08-09 16:36:08 +00:00
Rhed Jao
d765cbf39c [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: 911cf2d31a -s ours am: 19f81c570a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I626cdf4c06cac5b1d61a6378378896b24f416456
 2021-08-09 16:35:40 +00:00
Automerger Merge Worker
9d99111863 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 am: abf186350e -s ours am: becc81961d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7856e89c650612503d25fbc6a922e08242b7023e
 2021-08-09 16:35:19 +00:00
Jayant Chowdhary
04bf5e61fb [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: b31822b392 -s ours am: df1723afdf -s ours am: 020f357bc9 -s ours am: c4a7666a7c -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history

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

Change-Id: I802091a3913301919bbae0e9cd030e39b3df16b1
 2021-08-09 16:34:11 +00:00
Jayant Chowdhary
811c886bab [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: 9e82fb98ed -s ours am: 1a17ae5c9b -s ours am: 2db515e1ec -s ours am: cfb14e7770 -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 6b0bcd60c8 is already in history

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

Change-Id: Ib3af81f1190c2571f4b9f54ea1919100dd8ef538
 2021-08-09 16:34:06 +00:00
Jayant Chowdhary
b80ff54c06 [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: b31822b392 -s ours am: df1723afdf -s ours am: 8b405b2c5f -s ours am: 6e391f8afa -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history

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

Change-Id: Ibbce6cad6f4199d4949fb92156deded9c4250f1d
 2021-08-09 16:34:00 +00:00
Rhed Jao
04a893efe9 [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: 2f0d2eeab4 -s ours am: 378b6c4e02 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ce8f2c9841e7b57d4d3141dae3df9269ca0749f
 2021-08-09 16:33:59 +00:00
Jayant Chowdhary
fda3b5a3a7 [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: 9e82fb98ed -s ours am: 1a17ae5c9b -s ours am: e5b26966c1 -s ours am: fdb5e86af7 -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 6b0bcd60c8 is already in history

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

Change-Id: If0008621a4dfe03cc3a4346f69243a12b6b0e023
 2021-08-09 16:33:55 +00:00
Derek Sollenberger
746eb921df Merge "CanvasContext::draw: flushAndSubmit when not drawing" into sc-dev am: 1171be085c am: 973eac4b05 am: b94d50a689 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15481327

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

Change-Id: I4e7011e33a25ff5bebc9d0c905fb88bb13d82fd9
 2021-08-09 16:33:06 +00:00
Rhed Jao
998bab10f0 [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: dcfd49f395 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iabfb1b9f1a52f254474657cdbfda585cb4bb2cc4
 2021-08-09 16:32:15 +00:00
Rhed Jao
19f81c570a [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: 911cf2d31a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I35dcf5a2de4753ca2dbc93825fe049a3e8940c03
 2021-08-09 16:31:43 +00:00
Automerger Merge Worker
becc81961d 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 am: abf186350e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If743aa581af48cf9380c6a32e23f66a57c62c63c
 2021-08-09 16:31:15 +00:00
Automerger Merge Worker
95df44fb44 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 am: 57d77132d6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id5fe3abff140579abfa5b5717b403cb3b71fc912
 2021-08-09 16:29:45 +00:00
Rhed Jao
378b6c4e02 [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: 2f0d2eeab4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I971bdaf7949b91dd0fa24c4fdd1a8d7dce11e6e7
 2021-08-09 16:29:20 +00:00
Jayant Chowdhary
c4a7666a7c [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: b31822b392 -s ours am: df1723afdf -s ours am: 020f357bc9 -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history

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

Change-Id: Ic3a803fba666a1166c2ac1e996c8d898966294d3
 2021-08-09 16:24:35 +00:00
Jayant Chowdhary
fbd41cbe7a [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: b31822b392 -s ours am: df1723afdf -s ours am: 020f357bc9 -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history

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

Change-Id: I718690cf9bf376a9b5a936e6c06c969f20032757
 2021-08-09 16:24:29 +00:00
Jayant Chowdhary
9523e06fed [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: 9e82fb98ed -s ours am: 1a17ae5c9b -s ours am: 2db515e1ec -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 6b0bcd60c8 is already in history

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

Change-Id: Iaf52cb500fb108a3f754a1afe87f0aa020a1fe5e
 2021-08-09 16:24:23 +00:00
Jayant Chowdhary
cfb14e7770 [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: 9e82fb98ed -s ours am: 1a17ae5c9b -s ours am: 2db515e1ec -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 6b0bcd60c8 is already in history

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

Change-Id: If28ca79ea0bb764365277ff2a7df2193455ff6be
 2021-08-09 16:24:23 +00:00
Jayant Chowdhary
6e391f8afa [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: b31822b392 -s ours am: df1723afdf -s ours am: 8b405b2c5f -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history

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

Change-Id: Ie8244c20cc20c576d727b0584c025661d9ae62ee
 2021-08-09 16:24:14 +00:00
Jayant Chowdhary
36d0b2fe21 [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: b31822b392 -s ours am: df1723afdf -s ours am: 953335164b -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history

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

Change-Id: I5fd737f876c1ec9134a440d83d4e4e6e1d3b6649
 2021-08-09 16:24:11 +00:00
Jayant Chowdhary
fdb5e86af7 [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: 9e82fb98ed -s ours am: 1a17ae5c9b -s ours am: e5b26966c1 -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 6b0bcd60c8 is already in history

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

Change-Id: I139eed3473df321b7416f289f7388ee2bf63289b
 2021-08-09 16:24:10 +00:00
Jayant Chowdhary
11cf208624 [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: 9e82fb98ed -s ours am: 1a17ae5c9b -s ours am: b5640b6127 -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 6b0bcd60c8 is already in history

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

Change-Id: I83ff7a5553aad3b4bdbf32293c411474d57d6846
 2021-08-09 16:23:44 +00:00
Kurt Dresner
9907453f3a Merge "Allow cross-user use of projection state APIs." into sc-v2-dev 2021-08-09 16:15:13 +00:00
Jayant Chowdhary
020f357bc9 [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: b31822b392 -s ours am: df1723afdf -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history

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

Change-Id: I52a280d47eeb96a16e269815d842c2a23aa0c927
 2021-08-09 16:06:32 +00:00
Jayant Chowdhary
2db515e1ec [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: 9e82fb98ed -s ours am: 1a17ae5c9b -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 6b0bcd60c8 is already in history

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

Change-Id: Ia1d3f4e2645a9507ee5c5b6ce1190a7cecceb317
 2021-08-09 16:06:28 +00:00
Jayant Chowdhary
953335164b [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: b31822b392 -s ours am: df1723afdf -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history

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

Change-Id: I74ef9ab5eb65bad24570cc5631684012e86f2d18
 2021-08-09 16:06:06 +00:00
Jayant Chowdhary
8b405b2c5f [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: b31822b392 -s ours am: df1723afdf -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history

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

Change-Id: I60fd815936ac375a1725266422325282efcb24d1
 2021-08-09 16:06:04 +00:00
Jayant Chowdhary
b5640b6127 [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: 9e82fb98ed -s ours am: 1a17ae5c9b -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 6b0bcd60c8 is already in history

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

Change-Id: I3787d39e92a3f542ea83251735763ccc4234943e
 2021-08-09 16:05:54 +00:00
Jayant Chowdhary
e5b26966c1 [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: 9e82fb98ed -s ours am: 1a17ae5c9b -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 6b0bcd60c8 is already in history

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

Change-Id: I8a13d5856b2686c647a3708f83ee0c56d1dcdb08
 2021-08-09 16:05:41 +00:00
Jayant Chowdhary
df1723afdf [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: b31822b392 -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history

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

Change-Id: Ifa85e47deac6e2a75eb4dfa4a215635a4f5bd053
 2021-08-09 15:58:01 +00:00
Jayant Chowdhary
1a17ae5c9b [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: 9e82fb98ed -s ours 
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 6b0bcd60c8 is already in history

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

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

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

Change-Id: I0dc4ada4e6e664d8517c710b8b905dffa825b2c0
 2021-08-09 15:45:20 +00:00