Ben Lin
177977cc41
Merge "Revert "Make PipTaskOrganizer protected."" into rvc-dev am: d0125c3734
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11845255
Change-Id: I532204e7667cdf6b55e39702f16308babd8f876e
2020-06-19 17:30:33 +00:00
Ben Lin
8cff874ce8
Merge "Revert "Make PipTaskOrganizer protected."" into rvc-dev am: d0125c3734
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11845255
Change-Id: Ib26b0cc6c244961357a4290fd3ad7cbf824e4071
2020-06-19 17:30:26 +00:00
Jack Yu
415510c8a2
Merge "Reset cell broadcast config before enabling all channels" into rvc-d1-dev-plus-aosp am: 2e91dd7039
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11922712
Change-Id: I699832d723958e658094d424fbe670de189befc2
2020-06-19 17:28:38 +00:00
Lyn Han
8380ec25f2
Merge "Lighten bubble scrim" into rvc-dev am: e3f751c42c am: 66ba5f4c33 am: 0673805e12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11924521
Change-Id: I764fe42190c5e7176a956e767a245b87b38af951
2020-06-19 17:28:04 +00:00
Automerger Merge Worker
b8c41de24b
Merge "Merge "Change BroadcastDispatcher to 1receiver/action" into rvc-dev am: d6b99a586a am: 4093fdef67" into rvc-d1-dev-plus-aosp am: fb52f6ce93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871757
Change-Id: Ibeaf0c58af38090cd5f5c87691e8501323cdaed9
2020-06-19 17:27:51 +00:00
Automerger Merge Worker
cba909a481
Merge "Merge "Lighten bubble scrim" into rvc-dev am: e3f751c42c am: bbf5c579a3" into rvc-d1-dev-plus-aosp am: 9621612051
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11924521
Change-Id: I1c97702151975ad0602f48daecb9f641539c8cce
2020-06-19 17:27:06 +00:00
Lyn Han
fd9bf853c2
Merge "Lighten bubble scrim" into rvc-dev am: e3f751c42c am: bbf5c579a3 am: 03737d7536
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11924521
Change-Id: I005c2b6aa9397b8bfc7e3fc9ab0fa8b95b721ff9
2020-06-19 17:26:43 +00:00
Automerger Merge Worker
9bde6b99ca
Merge "Merge "Change BroadcastDispatcher to 1receiver/action" into rvc-dev am: d6b99a586a am: 73d6f232f8 am: 7cdf70c372" into rvc-qpr-dev-plus-aosp
2020-06-19 17:26:40 +00:00
Automerger Merge Worker
2820c5da9b
Merge "Merge "Don't clear mUsingBLASTSyncTransaction until sending callback" into rvc-dev am: 259309f1d3 am: 7b772844a4" into rvc-d1-dev-plus-aosp am: b76e7d4ede
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11854634
Change-Id: If461b70b2b75125c57a155c4c659786052d1ba7b
2020-06-19 17:26:30 +00:00
Fabian Kozynski
1d0f904e99
Merge "Change BroadcastDispatcher to 1receiver/action" into rvc-dev am: d6b99a586a am: 73d6f232f8 am: 7cdf70c372
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871757
Change-Id: Ic6d311990fac62439fd7b03872d1c940594afe81
2020-06-19 17:26:23 +00:00
Chavi Weingarten
cab80589b4
Merge "Don't clear mUsingBLASTSyncTransaction until sending callback" into rvc-dev am: 259309f1d3 am: dfaa7932a2 am: f509768957
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11854634
Change-Id: I4cce043903f8f40057e9a63bff489059e2ac47cd
2020-06-19 17:26:11 +00:00
Fabian Kozynski
a809e8afd6
Merge "Change BroadcastDispatcher to 1receiver/action" into rvc-dev am: d6b99a586a am: 73d6f232f8 am: 932d079b9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871757
Change-Id: Id870a5c5388d1be18af3ed259ae4d199cafa3597
2020-06-19 17:26:03 +00:00
Chavi Weingarten
32d5c465b8
Merge "Don't clear mUsingBLASTSyncTransaction until sending callback" into rvc-dev am: 259309f1d3 am: dfaa7932a2 am: 6ba9944c1e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11854634
Change-Id: I0938755bc870b4f777d762f528e8549943c2a900
2020-06-19 17:25:52 +00:00
Shuzhen Wang
84a475a20f
Camera: Allow reprocessing session to configure physical streams
...
Do not disallow reprocessable session to use physical streams.
At the same time, we cannot claim reprocessing to/from physical streams
work because:
1. It's undefined behavior to reprocess an input buffer into a physical
stream of different physical camera, or an input physical stream buffer
into an output buffer of different physical camera.
2. If the reprocessing input buffer comes from different physical cameras
with different sizes, because the current HAL API doesn't support sending
different size buffers through input stream, there isn't a
non-vendor-specific solution available.
Bug: 157123506
Test: vendor testing
Change-Id: I1ccf2b3918c1cb475b1baec10d35c6785b25208d
2020-06-19 17:23:52 +00:00
Jack Yu
2e91dd7039
Merge "Reset cell broadcast config before enabling all channels" into rvc-d1-dev-plus-aosp
2020-06-19 17:22:41 +00:00
Brad Ebinger
e170706352
Remove IllegalArgumentException for registration of capabilities
...
We threw an IllegalArgumentException for an invalid subscription,
however this is counter to what this exception should be used for.
Instead, use ImsException#CODE_ERROR_INVALID_SUBSCRIPTION.
Also fixed incorrect ImsException sent when telephony crashed.
Bug: 156402275
Fixes: 159135792
Test: atest FrameworksTelephonyTests; CtsTelephonyTestCases; manual
Change-Id: I3250419a2438afb58922ae653e3f2e4f9628e593
Merged-In: I3250419a2438afb58922ae653e3f2e4f9628e593
2020-06-19 17:20:22 +00:00
Ben Lin
d0125c3734
Merge "Revert "Make PipTaskOrganizer protected."" into rvc-dev
2020-06-19 17:18:51 +00:00
Jonathan Scott
3e7c68412e
Turn off quiet mode in the background, allowing the dialog to dismiss
...
quicker.
Test: Manual test of launching a work app with quiet mode on.
Bug: 158934594
Change-Id: I36a9e8717ce5b6aa5e4009468364914fcc73b80c
2020-06-19 18:17:53 +01:00
Lyn Han
0673805e12
Merge "Lighten bubble scrim" into rvc-dev am: e3f751c42c am: 66ba5f4c33
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11924521
Change-Id: I79829213fcb3bca8ef01cd44c6e83bfae3cade9d
2020-06-19 17:11:12 +00:00
Lyn Han
03737d7536
Merge "Lighten bubble scrim" into rvc-dev am: e3f751c42c am: bbf5c579a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11924521
Change-Id: I307d41f9b880c17be3ea39cd31123dd7df7621d4
2020-06-19 17:11:09 +00:00
Automerger Merge Worker
fb52f6ce93
Merge "Merge "Change BroadcastDispatcher to 1receiver/action" into rvc-dev am: d6b99a586a am: 4093fdef67" into rvc-d1-dev-plus-aosp
2020-06-19 17:11:03 +00:00
Fabian Kozynski
7cdf70c372
Merge "Change BroadcastDispatcher to 1receiver/action" into rvc-dev am: d6b99a586a am: 73d6f232f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871757
Change-Id: I017782c622dc0db7911501f77e9da4678824de11
2020-06-19 17:11:00 +00:00
Fabian Kozynski
1508048bbe
Merge "Change BroadcastDispatcher to 1receiver/action" into rvc-dev am: d6b99a586a am: 4093fdef67
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871757
Change-Id: I8423a685074a8a55621aeddb67faf0e3fcb2baa1
2020-06-19 17:10:56 +00:00
Automerger Merge Worker
9621612051
Merge "Merge "Lighten bubble scrim" into rvc-dev am: e3f751c42c am: bbf5c579a3" into rvc-d1-dev-plus-aosp
2020-06-19 17:10:55 +00:00
Automerger Merge Worker
b76e7d4ede
Merge "Merge "Don't clear mUsingBLASTSyncTransaction until sending callback" into rvc-dev am: 259309f1d3 am: 7b772844a4" into rvc-d1-dev-plus-aosp
2020-06-19 17:10:44 +00:00
Chavi Weingarten
f509768957
Merge "Don't clear mUsingBLASTSyncTransaction until sending callback" into rvc-dev am: 259309f1d3 am: dfaa7932a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11854634
Change-Id: Ie2e3a96a3a588886039dcc2e358e2ec8ae95497f
2020-06-19 17:10:39 +00:00
Lyn Han
c6f6f40be9
Merge "Lighten bubble scrim" into rvc-dev am: e3f751c42c am: bbf5c579a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11924521
Change-Id: I28f644dc9ac3261f2e2773f76db61ec7b418b7c9
2020-06-19 17:10:37 +00:00
Chavi Weingarten
bd487ed024
Merge "Don't clear mUsingBLASTSyncTransaction until sending callback" into rvc-dev am: 259309f1d3 am: 7b772844a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11854634
Change-Id: I12821209803b53125ff26eb4da01e8e5f26b43fd
2020-06-19 17:10:30 +00:00
Fabian Kozynski
932d079b9b
Merge "Change BroadcastDispatcher to 1receiver/action" into rvc-dev am: d6b99a586a am: 73d6f232f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871757
Change-Id: I5eef01d367767faa19a0dd8d22e52f24e0f54c55
2020-06-19 17:10:28 +00:00
Chavi Weingarten
6ba9944c1e
Merge "Don't clear mUsingBLASTSyncTransaction until sending callback" into rvc-dev am: 259309f1d3 am: dfaa7932a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11854634
Change-Id: Ic3d925ef4c4fd2777738e5ec2391a134946d3efa
2020-06-19 17:10:12 +00:00
Lyn Han
66ba5f4c33
Merge "Lighten bubble scrim" into rvc-dev am: e3f751c42c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11924521
Change-Id: Ibd0fab398cdce9c0e42c9ec7bcbc91fe829699f6
2020-06-19 16:58:33 +00:00
Fabian Kozynski
4093fdef67
Merge "Change BroadcastDispatcher to 1receiver/action" into rvc-dev am: d6b99a586a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871757
Change-Id: I4b0445911854a10f0787dce18cc4fd4d85a36ca5
2020-06-19 16:58:16 +00:00
Lyn Han
bbf5c579a3
Merge "Lighten bubble scrim" into rvc-dev am: e3f751c42c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11924521
Change-Id: I323e2eb72ffd7a1f228559500053de60d6214857
2020-06-19 16:58:01 +00:00
Fabian Kozynski
73d6f232f8
Merge "Change BroadcastDispatcher to 1receiver/action" into rvc-dev am: d6b99a586a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871757
Change-Id: Ieea3a890545df4ecc0db3d0f79ec166f63065917
2020-06-19 16:57:33 +00:00
Chavi Weingarten
7b772844a4
Merge "Don't clear mUsingBLASTSyncTransaction until sending callback" into rvc-dev am: 259309f1d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11854634
Change-Id: Iff678b6a82353c3a2520707a2881513e0aa06651
2020-06-19 16:57:28 +00:00
Chavi Weingarten
dfaa7932a2
Merge "Don't clear mUsingBLASTSyncTransaction until sending callback" into rvc-dev am: 259309f1d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11854634
Change-Id: Ieb7cbb1fd3087ab8b24926027d39d843df6b3ca2
2020-06-19 16:56:56 +00:00
Lyn Han
e3f751c42c
Merge "Lighten bubble scrim" into rvc-dev
2020-06-19 16:53:05 +00:00
Automerger Merge Worker
5b14ecb03b
Merge "Merge "Another setting.pkg null check" into rvc-dev am: 171f5f2857 am: 38c4e953df" into rvc-d1-dev-plus-aosp am: 5b63a4a897
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11917940
Change-Id: I42f6964c37e783b203cb99d2fbe9900d7e786e40
2020-06-19 16:52:23 +00:00
TreeHugger Robot
265cac25f7
Merge "Another setting.pkg null check" into rvc-dev am: 171f5f2857 am: 38c4e953df am: 285a13665b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11917940
Change-Id: I0d22fb6e8cc522e877f52b3a60ec06afe1dc5c23
2020-06-19 16:51:57 +00:00
TreeHugger Robot
31d1f1d154
Merge "Another setting.pkg null check" into rvc-dev am: 171f5f2857 am: ca3cc25e57 am: 40b310c737
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11917940
Change-Id: I4513939ead4500ce06640772d7e2f0dcfc9216e0
2020-06-19 16:51:48 +00:00
Miranda Kephart
6864874f6d
Close screenshot UI on CLOSE_SYSTEM_DIALOGS intent
...
Bug: 158845370
Fix: 158845370
Bug: 148808304
Test: manual -- tapped search bar, took a screenshot, and then
swiped up to home to verify that the home screen reappeared
correctly
Change-Id: I74d16e71392482185bb87d8f5d71ea93f38a40d6
2020-06-19 12:49:10 -04:00
Fabian Kozynski
d6b99a586a
Merge "Change BroadcastDispatcher to 1receiver/action" into rvc-dev
2020-06-19 16:46:11 +00:00
Chavi Weingarten
259309f1d3
Merge "Don't clear mUsingBLASTSyncTransaction until sending callback" into rvc-dev
2020-06-19 16:42:59 +00:00
Automerger Merge Worker
5b63a4a897
Merge "Merge "Another setting.pkg null check" into rvc-dev am: 171f5f2857 am: 38c4e953df" into rvc-d1-dev-plus-aosp
2020-06-19 16:41:17 +00:00
TreeHugger Robot
40b310c737
Merge "Another setting.pkg null check" into rvc-dev am: 171f5f2857 am: ca3cc25e57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11917940
Change-Id: Ibde636c09bf39fb82ce18b0b42a4319ad71d8273
2020-06-19 16:41:10 +00:00
TreeHugger Robot
285a13665b
Merge "Another setting.pkg null check" into rvc-dev am: 171f5f2857 am: 38c4e953df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11917940
Change-Id: Ib3a5015b78725b1bd26b1c3302c447889aa20ee0
2020-06-19 16:41:00 +00:00
TreeHugger Robot
008b7257ef
Merge "Another setting.pkg null check" into rvc-dev am: 171f5f2857 am: 38c4e953df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11917940
Change-Id: If5ae040b03bbcb47003e552536b23cbc6622eabf
2020-06-19 16:41:00 +00:00
Tim Murray
d33c6f8181
Revert "Revert "Only promote remote animator to top sched group during animation""
...
This reverts commit b83ab2c4f4 .
Reason for revert: try original CL again with zygote top-app change
Change-Id: I85a381542a334ec043ac392d74895cf57832bc12
Test: TH
bug: 159201879
2020-06-19 16:40:47 +00:00
TreeHugger Robot
38c4e953df
Merge "Another setting.pkg null check" into rvc-dev am: 171f5f2857
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11917940
Change-Id: I0ee7d008075aa0ac167934a36a13ba6490bc7854
2020-06-19 16:29:33 +00:00
TreeHugger Robot
ca3cc25e57
Merge "Another setting.pkg null check" into rvc-dev am: 171f5f2857
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11917940
Change-Id: I25d355df19345ffb4d22755ad27b2b8414955ad7
2020-06-19 16:29:27 +00:00