Jerry Chang
ff085c3975
Merge "Add lock task check when applying window container transaction" into sc-dev am: a20b10345d am: 744dec3304
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13417776
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idd1627d029b2c00fb337f8244f5a38fd3e8c200e
2021-01-29 21:12:17 +00:00
TreeHugger Robot
57123dd298
Merge "Correct setPowerSaveMode() java doc" into sc-dev am: 6c6fb9eab8 am: 0595cb3496
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425263
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2508e66e7c6ca1c8e84b1f1994567ec177972862
2021-01-29 21:12:06 +00:00
Joshua Mccloskey
6331030232
Merge "Added debug parameter to FaceService" into sc-dev am: c8f8ad2f54 am: 05963c233f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13411828
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5aaa1fdf3526319161fa95288e0413ed0aa22493
2021-01-29 21:08:27 +00:00
TreeHugger Robot
3fc9dffa58
Merge "Letterbox: configurable rounded corners." into sc-dev am: 544ee86b0c am: c8b1b9e458
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13418586
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I632e0a8a15e91e006f2bd5b994fcdcbb1c311c9e
2021-01-29 21:08:12 +00:00
TreeHugger Robot
80055726e5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: e83fcb8c7a -s ours am: d2061ed963 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13433206
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iacd045530af5fe2c3b766b8cf2e2908a27d5a372
2021-01-29 21:07:56 +00:00
TreeHugger Robot
58770f78b1
Merge "Re-map DisplayAreaAppearedInfo to token-leash map" into sc-dev am: 9cc46e4fe3 am: 2ed6bdf0fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13414868
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idefc4c087d42dd951098d94fb72c17c897696b8b
2021-01-29 21:07:45 +00:00
Oscar Shu
e4c0e64a78
Merge "New startScan API for 6Ghz RNR support" into sc-dev am: ba8e450629 am: 34b036f0e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13419725
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie7108e771928ed633ec3321e1b3099fd599de342
2021-01-29 21:06:18 +00:00
Seigo Nonaka
cbe86ab4a8
Merge "Do not hold unnecessary map reference" into sc-dev am: b755757c2f am: ef1319a4e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13432327
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I87e2185470292850ba9c7bb5a5357f6d8638f7ba
2021-01-29 21:05:58 +00:00
Lucas Dupin
6ea801a7b0
Merge "Make gray palette neutral" into sc-dev am: dc39b95802 am: b33770332f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13430524
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7e873a1e2b1fb3ea4bb2b10a75a0d57c3d064156
2021-01-29 21:05:44 +00:00
Alex Salo
3632d60db1
Merge "Setup metrics collection in rotation resolver manager." into sc-dev am: 8a0ada5f7a am: 81cea41ee5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13419726
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3e193fc739252e3ede3f0f1b4500e5f834b0b993
2021-01-29 21:05:14 +00:00
Sam Saccone
b5e394293c
Merge "Fix include of owners that was pointing to itself, and not loading the expected owners that were desired in ag/13414459" into sc-dev am: 270ff01e1c am: 1a882262cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13433096
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I99c00ddbeba85a9cad5700e34602faad0df8ef1b
2021-01-29 21:04:54 +00:00
Chris Li
770d44c9a1
Merge "Allow non-resizable apps in split-screen (4/n)" into sc-dev am: 3c56075401 am: 640f5e3d86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13412975
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia8d17acdd80ab108b636267d516d08a70bfa8eea
2021-01-29 21:04:37 +00:00
Zoey Chen
5296c735e4
Merge "[PhysicalChannelConfig] RIL will report UNKNOWN range to PhysicalChannelConfig and it can not throw out Exception." into sc-dev am: 20c5582b51 am: 215eee9a04
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425168
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5fe4c0762dd6b5adaf5b1a6e164afd5ac6a5ceca
2021-01-29 21:04:23 +00:00
Jeff Chang
fa5a141104
Merge "Make activity on visible and focusable leaf tasks be resumed" into sc-dev am: 9c7bfbf651 am: 75f9eb49f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13424926
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I416c89dadb2d055efb333d55cfdb0941130bb952
2021-01-29 21:03:36 +00:00
TreeHugger Robot
e3ae1ad74b
[automerger skipped] Merge "Revert "[pm/incremental] start monitoring progress on storage creation"" into sc-dev am: 76e71ffa2c am: 5172e5f8b3 -s ours
...
am skip reason: Change-Id I124033d725fe488fd337b6ded0bdf319a764b6ca with SHA-1 d0cec52acb is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13431765
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4c36a1ab09e786318dc7bd4526eccb809bbac7ed
2021-01-29 21:03:04 +00:00
TreeHugger Robot
1c4dc4600d
Merge "Move screen off adjustment delay to JobConcurrencyManager." into sc-dev am: b3a28d9dfd am: db6e396312
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13430571
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8a8d1bffe4d13b410bf55abe406a056baf94d626
2021-01-29 21:02:36 +00:00
George Chang
99576e3d3d
[automerger skipped] Merge "Don't restore nfc qs tile if it is not in the stock" into sc-dev am: 19c6e42b5d am: 4c9601f71b -s ours
...
am skip reason: Change-Id I2863d365aff9a3fe6afe1cb0915dd076bf543cd3 with SHA-1 173e49ebda is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13417786
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id2cb5987e4d6e7d52c0cb09aa5807124deed12af
2021-01-29 21:01:30 +00:00
Lucas Dupin
537892940e
Merge "Map some more colors to new palette" into sc-dev am: 06b26afe43 am: cb87d4064c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13418659
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I26c478952f4a3c5260a9c10fac25c5f0fc5e4563
2021-01-29 21:01:04 +00:00
TreeHugger Robot
94c13325c6
[automerger skipped] Merge "Add config config_voice_data_sms_auto_fallback" into sc-dev am: 910dbd20bf am: 5ea47c0705 -s ours
...
am skip reason: Change-Id I0d9f8cee27d6ca79489c2fc5cc721a6bc461c2be with SHA-1 04d446e98b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13429021
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icf38caf5b43d0875f1aaa92d43dbde9b346e156e
2021-01-29 21:00:34 +00:00
TreeHugger Robot
fe415b09a1
Merge "SyncRtSurfaceTransactionApplier: Use BLASTSync" into sc-dev am: 116ad8d147 am: c933f8c38b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13421365
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icad8c7ef4100b55b15891a29c0efae70afcc7a8a
2021-01-29 20:59:29 +00:00
TreeHugger Robot
fa7eac61ca
Merge "Return empty array rather than null" into sc-dev am: 80bb0561bf am: f8e1adda39
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13421016
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id48bd0a0300b293fc7fddb3e62db055c8253de50
2021-01-29 20:58:55 +00:00
Benedict Wong
4b1124089a
Merge "Start VcnManagementService after ConnectivityService" into sc-dev am: 136109f1cf am: 986799af5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13428696
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I660dc4edd6377a6690182c54dbc3f93be2c50b52
2021-01-29 20:58:35 +00:00
Suprabh Shukla
b544e61e4f
Merge "Turn off device_idle_alarms logging" into sc-dev am: 7c98c28f7f am: 40db90c8c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13428599
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I29ccee32f44b5e02bd3f2668e2eed97dbd96eab6
2021-01-29 20:58:13 +00:00
Hall Liu
bf7419949f
[automerger skipped] Merge changes from topic "composer-final-integration" into sc-dev am: 0fdcbb8cfb am: 1f823eb0c6 -s ours
...
am skip reason: Change-Id Ie171c8f978db7de30e81800c464b2bd68aff73f8 with SHA-1 0af0cdb981 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13422786
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I717ef1a16c66740c5e4d42dd472c0333d4c04189
2021-01-29 20:57:22 +00:00
Hall Liu
c37f83103f
[automerger skipped] Add support for integrating call composer am: a749abcead am: 1138d7c103 -s ours
...
am skip reason: Change-Id I602b51da6009c884364a026781ca3c160978fbd1 with SHA-1 2d1bc540e4 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13429553
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I10d6410a66ea07c07e20b4120ed640760bcece8b
2021-01-29 20:57:06 +00:00
Treehugger Robot
ff2b075215
Merge "Create owners" am: 008819a578 am: 595c08e82e am: ab29544623 am: e6a05d7167 am: 931bc189b6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563992
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaf6fc21f237f102f6b2b05f0aecd0f4175859499
2021-01-29 20:55:55 +00:00
Treehugger Robot
46e3ddcfa0
Merge "Keystore 2.0 SPI: Add back-off hint to BackendBusyException." am: 9aba68730c am: b03763fb58 am: 1f8a1b854d am: 468a665964 am: f42471bb15
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558768
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I11df763f9bed016a0811fd86e048754fa8d9c5f3
2021-01-29 20:52:14 +00:00
Treehugger Robot
18476f036b
[automerger skipped] Merge "Fix race condition in linearblock release between TIS and MediaCodec" am: 49467f1cdf am: 409784587c am: b4624bfd76 -s ours am: 8b756e725e -s ours am: 7a2e18ed24 -s ours
...
am skip reason: Change-Id I13f924adc3586607eb3a60d184e7786536c7b788 with SHA-1 7bff9d579a is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563873
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9243b0785211d4a46247542cb23a42b9a8e6969e
2021-01-29 20:50:39 +00:00
Jiashen Wang
72e7897a7d
[automerger skipped] Merge changes from topics "downloadable_init_change_1", "downloadable_init_change_2" am: f2193be3f0 am: 7556b81f80 am: 06bca1be6c -s ours am: f11798a036 -s ours am: 22d120e22d -s ours
...
am skip reason: Change-Id Ia8fd0ab98c33d1e30b4fce1bad53b1c628364725 with SHA-1 ff5672ff43 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562763
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I83ba1913a3235d615e5c675fbf1a80ba6b8df92c
2021-01-29 20:48:54 +00:00
Jiashen Wang
53caae4fc9
[automerger skipped] Init DownloadableSubscription with Confirmation Code am: 738abf603a am: bff8fecf85 am: d27f188913 -s ours am: 0435fa7940 -s ours am: 8420fea120 -s ours
...
am skip reason: Change-Id Icfa8b0f5b1699d24d8e39c3297ed25c7d1607739 with SHA-1 117f353a0b is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562762
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0b224b4e4ef460e072f83e14f4a2a34a87b88e53
2021-01-29 20:47:48 +00:00
TreeHugger Robot
5caf5233b1
Merge "Enabling plugins on Launcher debug builds" into sc-dev am: 620f53fe30 am: 3105af8fff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13419087
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I03fc1ab0c078f9adfc44b5238099fdb0c835640d
2021-01-29 20:45:59 +00:00
Ahaan Ugale
b2e879a058
Merge "VoiceInteraction: Handle session delivery failure."
2021-01-29 19:57:08 +00:00
Eugene Susla
138f9e9cbe
Merge "Provide CDM util to check if ok to pair BT without prompt"
2021-01-29 19:42:35 +00:00
Alex Buynytskyy
a223717f1c
Merge "Inherited installation support for Incremental."
2021-01-29 19:07:10 +00:00
Siarhei Vishniakou
28a4a65741
Merge "Send input event id to SurfaceFlinger"
2021-01-29 18:39:46 +00:00
Chloris Kuo
2597d448f2
Merge "Conversation Blocklist"
2021-01-29 17:51:57 +00:00
Bhalchandra Gajare
85618953c6
Merge "AudioAttributes: add ability to set Hotword mode for capture"
2021-01-29 16:57:59 +00:00
Bill Yi
18bff3ede6
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-01-29 16:40:07 +00:00
Alex Buynytskyy
ef5a0dbc35
Inherited installation support for Incremental.
...
Bug: 162345970
Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest PackageManagerServiceTest ChecksumsTest
Change-Id: I360f44bc52e05553eacc448faa26f603d9eaae59
2021-01-29 07:29:44 -08:00
Ahaan Ugale
89d413cb5d
VoiceInteraction: Handle session delivery failure.
...
When the system connects to the VoiceInteractionSessionService, it
requests the service to create a new session. The service then delivers
this session to the system. Currently, a failure to deliver it is just
ignored, and the service continues to initialize the session. This
silently leaves the session in an invalid state where operations with it
always fail (since the system doesn't recognize the session).
There's currently a concurrency bug in the system server that causes the
session delivery to fail occasionally. Even with that fixed though, it's
good to handle unexpected errors here.
Fix: 178776751
Test: atest CtsVoiceInteractionTestCases --iterations
Change-Id: I3489db108158fa7c71179bee3d098ecd4ab6b2bd
2021-01-29 09:50:09 +00:00
Jerry Chang
744dec3304
Merge "Add lock task check when applying window container transaction" into sc-dev am: a20b10345d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13417776
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3bdbc9c15c3dedd38661ca9ccf309fb674005440
2021-01-29 08:18:06 +00:00
Jerry Chang
a20b10345d
Merge "Add lock task check when applying window container transaction" into sc-dev
2021-01-29 08:11:46 +00:00
TreeHugger Robot
0595cb3496
Merge "Correct setPowerSaveMode() java doc" into sc-dev am: 6c6fb9eab8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425263
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ica7b92da5fcf57fc1009e10bdc472f0fef64bb87
2021-01-29 07:34:50 +00:00
TreeHugger Robot
6c6fb9eab8
Merge "Correct setPowerSaveMode() java doc" into sc-dev
2021-01-29 07:27:27 +00:00
Joshua Mccloskey
05963c233f
Merge "Added debug parameter to FaceService" into sc-dev am: c8f8ad2f54
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13411828
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5ccec28759c781875d11f95b1941677f544bdfb3
2021-01-29 06:38:19 +00:00
TreeHugger Robot
c8b1b9e458
Merge "Letterbox: configurable rounded corners." into sc-dev am: 544ee86b0c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13418586
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I44b1d462569411af32e15207f12e519c90866475
2021-01-29 06:37:19 +00:00
TreeHugger Robot
d2061ed963
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: e83fcb8c7a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13433206
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I36753b42adfad680680c54b418c1296c1da556a7
2021-01-29 06:36:53 +00:00
TreeHugger Robot
2ed6bdf0fe
Merge "Re-map DisplayAreaAppearedInfo to token-leash map" into sc-dev am: 9cc46e4fe3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13414868
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I334c4e60c84a6f37e02ad25cef10231d56880d68
2021-01-29 06:36:16 +00:00
Oscar Shu
34b036f0e6
Merge "New startScan API for 6Ghz RNR support" into sc-dev am: ba8e450629
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13419725
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic40413ba3888bb69a65ef69447466219f78f8ba6
2021-01-29 06:35:41 +00:00
Joshua Mccloskey
c8f8ad2f54
Merge "Added debug parameter to FaceService" into sc-dev
2021-01-29 06:24:34 +00:00