Commit Graph

767323 Commits

Author SHA1 Message Date
Pablo Gamito
9fd0212e95 Merge "Revert "Revert "Add ability to trace shell transitions""" into tm-qpr-dev 2022-06-01 12:19:49 +00:00
Nick Chameyev
2e143a6a4e Merge "Update notifications clipping for portrait large screens" into tm-qpr-dev 2022-06-01 12:18:46 +00:00
TreeHugger Robot
edc6a5606e Merge "Fix split root removed accidentally" into tm-qpr-dev 2022-06-01 12:09:28 +00:00
Junyu Lai
f6c9abef00 Merge "Fix crash when incrementing data usage request" into tm-dev am: 5b73f4bef4 am: e8642adc64
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18583185

Change-Id: I2fedac0a88a4f73fcee66ccc9277937f4941ff1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 10:42:08 +00:00
Junyu Lai
e8642adc64 Merge "Fix crash when incrementing data usage request" into tm-dev am: 5b73f4bef4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18583185

Change-Id: I3ad20d0d4ddea5ed5ed9d3aae0c1b17443c01e92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 10:17:37 +00:00
Junyu Lai
5b73f4bef4 Merge "Fix crash when incrementing data usage request" into tm-dev 2022-06-01 09:45:05 +00:00
TreeHugger Robot
58db11b551 Merge "Extend the max count for retrying to request DirectActions to 7." into tm-dev am: fcf090345b am: cc83c18df3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18693166

Change-Id: Ie008735144c486d434f5661728821500e720c16f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 09:17:18 +00:00
TreeHugger Robot
0232f47db6 Merge "Log why presentation was not shown" into tm-dev am: bd26701a6b am: e25d1148e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18519537

Change-Id: I6a7a3a46319f614e4a13cf73ffdd328714970c08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 09:17:05 +00:00
Charles Chen
cc0966bfd7 Merge "Respect minimum dimensions for embedded Activities" into tm-qpr-dev 2022-06-01 09:02:22 +00:00
TreeHugger Robot
cc83c18df3 Merge "Extend the max count for retrying to request DirectActions to 7." into tm-dev am: fcf090345b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18693166

Change-Id: I146bf4dea15d7e958d1ad48055d7352afae01282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 08:53:27 +00:00
TreeHugger Robot
e25d1148e7 Merge "Log why presentation was not shown" into tm-dev am: bd26701a6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18519537

Change-Id: I11cf7ddda22f853a81e9f69806ae752ac4ca5d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 08:52:59 +00:00
Tony Huang
8fb82cdb5d Fix split root removed accidentally
While handleStartResult, if it start unsucessful, the root task might
be remove and cause split root removed accidentally. It will cause
crash next time active split screen. We should avoid the task removed
here if it is creadted by organizer.

Bug: 234406935
Test: manual
Test: pass existing tests
Change-Id: I383682625fa0b90ec8d59873f813ed46162eef12
2022-06-01 16:37:09 +08:00
TreeHugger Robot
fcf090345b Merge "Extend the max count for retrying to request DirectActions to 7." into tm-dev 2022-06-01 08:22:04 +00:00
TreeHugger Robot
bd26701a6b Merge "Log why presentation was not shown" into tm-dev 2022-06-01 08:04:53 +00:00
Betty Chang
4e94df4fd4 Merge "[LE] Test cases for Media Output Broadcast Dialog" into tm-dev am: fc02968aac am: 69538f6613
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18287503

Change-Id: I86c410f09f4e89b0b6f872d75696292167b5b740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 08:02:34 +00:00
Betty Chang
69538f6613 Merge "[LE] Test cases for Media Output Broadcast Dialog" into tm-dev am: fc02968aac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18287503

Change-Id: I46fcd9141795b67105853321d4eded007b5c2b4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 07:38:49 +00:00
Betty Chang
fc02968aac Merge "[LE] Test cases for Media Output Broadcast Dialog" into tm-dev 2022-06-01 07:20:49 +00:00
Peter Li
c80818f9ed Extend the max count for retrying to request DirectActions to 7.
Bug: 224789902
Change-Id: I986f1b5534c8cae69c770fb67cf9ebbbeb7c75dd
Test: atest CtsVoiceInteractionTestCases
2022-06-01 04:44:50 +00:00
TreeHugger Robot
199d93fd54 Merge "Postpone the request direct actions before onStart" into tm-dev am: 0d84708056 am: cf05c79ea0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18628126

Change-Id: Ibbfcc51b996298ce0880e4a95dbbb042aedeb75d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 04:11:34 +00:00
TreeHugger Robot
cf05c79ea0 Merge "Postpone the request direct actions before onStart" into tm-dev am: 0d84708056
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18628126

Change-Id: Ieb1eaeb742bf3a98c466d32fb6fff3ba5d795daf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 03:53:37 +00:00
Michael Wright
941264d57e Merge "Invoke BrightnessSetting callbacks even with identical brightness." into tm-dev am: aabe27b7a4 am: fd51081ecf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17916604

Change-Id: Ic22c5d49e5c1d96a660eea602bab97267ad8b1ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 03:31:17 +00:00
Louis Chang
5dbac7a946 Merge "Adding the new activity on the same TF of the cleared activity" into tm-dev am: b4c09cd2b1 am: 50e42f8b74
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18669206

Change-Id: Ibbb924af45d4ed35d9ac06dcb7f1862bd66c442d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 03:30:57 +00:00
TreeHugger Robot
0d84708056 Merge "Postpone the request direct actions before onStart" into tm-dev 2022-06-01 03:29:35 +00:00
Michael Wright
fd51081ecf Merge "Invoke BrightnessSetting callbacks even with identical brightness." into tm-dev am: aabe27b7a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17916604

Change-Id: I4963a8a16cb6073c9c1e7c978924491a3e55c20c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 02:59:26 +00:00
Louis Chang
50e42f8b74 Merge "Adding the new activity on the same TF of the cleared activity" into tm-dev am: b4c09cd2b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18669206

Change-Id: Ib3698d16119c04027c5c433958176a0bed5506d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 02:58:59 +00:00
TreeHugger Robot
96f3ac3bc2 Merge "Allows the hierarchy operations in lock-task mode" into tm-qpr-dev 2022-06-01 02:51:28 +00:00
Michael Wright
aabe27b7a4 Merge "Invoke BrightnessSetting callbacks even with identical brightness." into tm-dev 2022-06-01 02:41:25 +00:00
Louis Chang
b4c09cd2b1 Merge "Adding the new activity on the same TF of the cleared activity" into tm-dev 2022-06-01 02:40:46 +00:00
James O'Leary
b2d0ee2998 Merge "Revert "Update light/dark detection."" into tm-dev am: d88a6933e8 am: a5f967a20a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18675018

Change-Id: I4957dd990bfe07a05db1439e80885342d1685a22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 01:52:32 +00:00
Ryan Lin
e49dcfca1b Merge "Drop the cloned windows from visible window list" into tm-dev am: 8ef351123b am: 2684945fb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18659076

Change-Id: Ib2521d2807afeeb61614532957caa48c82785d7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 01:52:06 +00:00
Matt Casey
b103a15573 Merge "Remove spans from edited text when copying back to clipboard" into tm-dev am: fc51b366b4 am: 251463ca7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18602605

Change-Id: I935540ba28d35e564bb4aff8d570ceb8b5dbb7dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 01:51:49 +00:00
Matt Casey
3759ddbc57 Merge "Make source color textColorSecondary" into tm-dev am: 707b534826 am: 8632a0a093
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18635986

Change-Id: I282ac0614e0c2edd9ad7b13ad8acdedc7cc99be2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 01:51:20 +00:00
Matt Casey
9c949ef5a0 Merge "Fix Chooser enter transition animation" into tm-dev am: 8d5bcaa534 am: 368670caf1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18609372

Change-Id: I77da87cc40f8fbea9d6da3ec2f47f79efc9f81f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 01:51:01 +00:00
Louis Chang
31fb253327 [automerger skipped] Merge "Restrict the smallest screen width dp of an embedded TF" into tm-dev am: e107722e17 am: 6bbb0bf8fb -s ours
am skip reason: Merged-In Ic085c6ed134c2787a26fd2b02b4345b04fb693e6 with SHA-1 9cee26e261 is already in history

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

Change-Id: If61961ea0396cc5bc6edc0f11cfc2b132be37f10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 01:50:22 +00:00
James O'Leary
a5f967a20a Merge "Revert "Update light/dark detection."" into tm-dev am: d88a6933e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18675018

Change-Id: I3e5e4dca8fe95314e5ee935f688fac29ef199175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 01:34:00 +00:00
Ryan Lin
2684945fb5 Merge "Drop the cloned windows from visible window list" into tm-dev am: 8ef351123b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18659076

Change-Id: I9759f26e0fd3da42d4e1b6ee0309cb61e91f5d8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 01:33:19 +00:00
James O'Leary
d88a6933e8 Merge "Revert "Update light/dark detection."" into tm-dev 2022-06-01 01:29:41 +00:00
Ryan Lin
8ef351123b Merge "Drop the cloned windows from visible window list" into tm-dev 2022-06-01 01:29:36 +00:00
Matt Casey
251463ca7d Merge "Remove spans from edited text when copying back to clipboard" into tm-dev am: fc51b366b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18602605

Change-Id: I5140305855c7b90f8cbd6d035ef3ef0803991a5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 01:27:07 +00:00
Matt Casey
8632a0a093 Merge "Make source color textColorSecondary" into tm-dev am: 707b534826
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18635986

Change-Id: I87581410cc815287b146ce83f996a36dbeaadc76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 01:26:25 +00:00
Matt Casey
368670caf1 Merge "Fix Chooser enter transition animation" into tm-dev am: 8d5bcaa534
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18609372

Change-Id: I2b8fcd21663d7426e6f1bb9b8a7fec16a440af99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 01:26:14 +00:00
Louis Chang
6bbb0bf8fb Merge "Restrict the smallest screen width dp of an embedded TF" into tm-dev am: e107722e17
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18668447

Change-Id: I7bbb09276e37babeb364d8d7a527bfa4b4680275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 01:25:39 +00:00
Junyu Lai
6675e03317 Fix crash when incrementing data usage request
This fixed a request leak problem which was introduced in previous
Android release but caught recently, where the budget of
MultipathPolicyTracker was cleaned before unregistering requests,
the logic in the tracker would skip the unregister if there is
no budget.

Ignore-AOSP-First: Urgent fix
Test: MultipathPolicyTrackerTest#testOnThresholdReached
Bug: 233733267
Fix: 145963406
Change-Id: Icee43a4ee913a6459a47632f608fa6cb8b2ed4c2
2022-06-01 09:25:02 +08:00
Matt Casey
fc51b366b4 Merge "Remove spans from edited text when copying back to clipboard" into tm-dev 2022-06-01 01:14:05 +00:00
Matt Casey
707b534826 Merge "Make source color textColorSecondary" into tm-dev 2022-06-01 01:13:58 +00:00
Matt Casey
8d5bcaa534 Merge "Fix Chooser enter transition animation" into tm-dev 2022-06-01 01:13:49 +00:00
Louis Chang
e107722e17 Merge "Restrict the smallest screen width dp of an embedded TF" into tm-dev 2022-06-01 01:07:42 +00:00
Raphael Kim
3dfb721966 Merge "Implement dumpsys for CompanionDeviceManagerService.CompanionDeviceManagerImpl" into tm-dev am: 99945d5d70 am: 655a929594
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18175782

Change-Id: I3b7e8c9189f25e66834a50a06725f2c71d817541
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 00:54:44 +00:00
Raphael Kim
655a929594 Merge "Implement dumpsys for CompanionDeviceManagerService.CompanionDeviceManagerImpl" into tm-dev am: 99945d5d70
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18175782

Change-Id: I35155c1b64756e52deb3e3e8a6f8e40ad53e31d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 00:24:57 +00:00
skxu
48a5cbb2d6 Log why presentation was not shown
Fixes: 219613425
Test: b/233833739
Change-Id: Ic95cc69b912e8144726124ebc8355c2d1e24079e
Merged-In: Ic95cc69b912e8144726124ebc8355c2d1e24079e
2022-06-01 00:10:02 +00:00