Commit Graph

643363 Commits

Author SHA1 Message Date
Lais Andrade
5403733b39 Merge "Move all interaction with vibrator HAL outside VibrationThread lock" into sc-dev am: 79ce03a8de
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14442074

Change-Id: I3a7a3170d7cf97679bf10c1f67cc68664c5872ae
2021-06-03 06:17:34 +00:00
Songchun Fan
61a605a7cf Merge "[SettingsProvider] add maxTargetSdk in @Readable" into sc-dev am: 52109a9328
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14744258

Change-Id: Idea2871f0d194c8f4051e9f28b79f105c25e212a
2021-06-03 06:17:17 +00:00
TreeHugger Robot
81e021516e Merge "Add support to register Java listeners for prox activation" into sc-dev am: c05ebb5b25
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14426685

Change-Id: I13fb486c3071829b51b8722b57d0ba899b3319a7
2021-06-03 06:17:05 +00:00
TreeHugger Robot
d9b13ac32b Merge "Do not disappear text when moving tiles" into sc-dev am: 285aee4a3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14532268

Change-Id: I562fdca05b8887e9059a9cb953492b5a665b3d3f
2021-06-03 06:16:55 +00:00
TreeHugger Robot
27b2fa3c26 Merge "Register prox secondary sensor when safe." into sc-dev am: 78774b577d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14736350

Change-Id: Iea12fe32451a7c6bd801910fdccbbbda4e4a4e6e
2021-06-03 06:16:46 +00:00
TreeHugger Robot
829b08637a Merge "Clarify what ignoring battery optimizations means." into sc-dev am: 1b3424aa94
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14748399

Change-Id: Ic62539b36fcd1e79ed86f01f9a45f22c99139ac2
2021-06-03 06:16:36 +00:00
Matt Casey
3649ea6cec Merge "Move ScrollView scroll capture to the center" into sc-dev am: 07056eaa46
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14752211

Change-Id: I3be83dca44dc2ae12fbce25a3106fb9aa3b5b14c
2021-06-03 06:16:24 +00:00
TreeHugger Robot
a907f8f362 Merge "Ensure MediaSession2Record is initialized before used" into sc-dev am: 960f56669c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14781658

Change-Id: I01cc2b7014da7fa72c896126c04642d6bb34593e
2021-06-03 06:16:13 +00:00
Galia Peycheva
91b7a8559b Merge "Fix dream not working on top of pinned apps" into sc-dev am: 1dfd948440
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14733700

Change-Id: I6cd3229ff08afd978aa83ef1e91690e90138b3d9
2021-06-03 06:16:02 +00:00
Kriti Dang
bebdc0ac07 Merge "Adding additional javadocs for setSurroundFormatEnabled" into sc-dev am: d7638021ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14775421

Change-Id: I8a57e65262572e87fc594baebb70432b49670966
2021-06-03 06:15:51 +00:00
Aaron Huang
fcd75fc310 Merge "Make sure the PAC script content is sent again" into sc-dev am: 10cbb66f1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14547067

Change-Id: If9f7e8389a9873337591d3d2a2723963ab67717a
2021-06-03 06:15:41 +00:00
Alex Johnston
d7f32bb992 Merge "Remove requireAutoTime on upgrade" into sc-dev am: c65974f14e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14234430

Change-Id: I0a3265a4cc282fa20ad534a6910300f75eb19556
2021-06-03 06:15:01 +00:00
Aaron Huang
42705a516d Merge "Remove IntDef annotations from NetworkPolicyManager" into sc-dev am: 2debdb3ec2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14747451

Change-Id: I96420d51511f91f7b55db4701fdf5ea7f50a8db0
2021-06-03 06:14:47 +00:00
Louis Chang
e3a5d23a74 Merge "Adding TaskFragment to provide the basic policies of a Task" into sc-v2-dev 2021-06-02 05:16:32 +00:00
Louis Chang
94ad41980a Adding TaskFragment to provide the basic policies of a Task
- Delegate the Task#getVisibility to TaskFragment
- Ensure activity visibilities in TaskFragment

Bug: 189384393
Test: build and boot
Change-Id: Ib143e9e58a0ced36cbe5d62e3ce0c93cec770bda
2021-06-02 10:12:02 +08:00
TreeHugger Robot
e0b77bee96 Merge "Initial commit for rotation contextual button" into sc-v2-dev 2021-06-02 02:05:40 +00:00
Evan Rosky
d4fcf3ac04 Merge "Inform SurfaceFlinger about displays which receive input" into sc-v2-dev 2021-06-01 21:17:14 +00:00
Vinit Nayak
14e81630b9 Initial commit for rotation contextual button
Bug: 180046394
Test: Events successfully passed through to launcher
Change-Id: I84c60dc89f560fdaf76afdbed8b5f9ec23b38856
2021-06-01 13:16:48 -07:00
Evan Rosky
08bcd0e804 Merge "Fix a small bug around deferring activity visibility" into sc-v2-dev 2021-06-01 19:20:15 +00:00
Evan Rosky
3c85ed5080 Inform SurfaceFlinger about displays which receive input
Right now, multiple display devices can share a layerstack.
This means that when constructing InputWindowInfo, its
impossible to know which display transform matches the
display viewport that inputflinger dispatches against. To
remedy this, have displaymanager inform surfaceflinger
which displays "receiveInput" using the same logic that
controls which display viewport it sends to inputflinger.

Bug: 179274888
Test: atest SetDisplayStateLockedTest
Change-Id: I85f1d0ac6fcf9c37a523eb80ed02afeff555c93d
2021-06-01 11:58:34 -07:00
Evan Rosky
ecaff118fb Fix a small bug around deferring activity visibility
Making the defer specific to the activity instead of "while
transition running". Otherwise, we can break changes in
visibility that don't occur during a transition while a
transition is running (eg. an app becoming visible due to
an on-top app changing translucency).

Bug: 183993924
Test: atest ActivityVisibilityTests#testConvertTranslucentOnNonTopTranslucentActivity
Change-Id: I1589b4d47733ed4182e1e7b5b10fe7957b8dceea
2021-06-01 10:32:49 -07:00
Lais Andrade
79ce03a8de Merge "Move all interaction with vibrator HAL outside VibrationThread lock" into sc-dev 2021-06-01 16:34:00 +00:00
Songchun Fan
52109a9328 Merge "[SettingsProvider] add maxTargetSdk in @Readable" into sc-dev 2021-06-01 16:08:23 +00:00
TreeHugger Robot
c05ebb5b25 Merge "Add support to register Java listeners for prox activation" into sc-dev 2021-06-01 15:53:59 +00:00
TreeHugger Robot
285aee4a3a Merge "Do not disappear text when moving tiles" into sc-dev 2021-06-01 15:01:20 +00:00
TreeHugger Robot
78774b577d Merge "Register prox secondary sensor when safe." into sc-dev 2021-06-01 14:51:16 +00:00
TreeHugger Robot
1b3424aa94 Merge "Clarify what ignoring battery optimizations means." into sc-dev 2021-06-01 14:39:55 +00:00
Matt Casey
07056eaa46 Merge "Move ScrollView scroll capture to the center" into sc-dev 2021-06-01 14:05:35 +00:00
TreeHugger Robot
960f56669c Merge "Ensure MediaSession2Record is initialized before used" into sc-dev 2021-06-01 13:53:03 +00:00
Gyumin Sim
a3aec61861 Ensure MediaSession2Record is initialized before used
NPE happens at mController.close() if session is destroyed while the
MediaController2 instance is being created in the constructor of
MediaSession2Record. It ensures the MediaSession2Record instance is
initialized before the instance is used by Controller2Callback.

Bug: 189119798
Fix: 189119798
Test: atest CtsMediaTestCases:android.media.cts.MediaSessionTest
Change-Id: I23ca2f3dbc657ac38f4154a0fb428a4c25e6b5ad
2021-06-01 21:20:05 +09:00
Lais Andrade
9934c33d8c Move all interaction with vibrator HAL outside VibrationThread lock
The calls to the Vibrator HAL (on, perform, compose, off) are done from
within synchronized blocks of code in VibrationThread. This makes calls
to cancel the thread or native callbacks wait for HAL interactions,
which might have a latency.

Fix this by moving all calls to the HAL to the thread main look and out
of any synchronized block.

Also added a regression test for this scenario.

Bug: 185191271
Fix: 189489898
Test: VibrationThreadTest
Change-Id: I1aaf0ef7162abd15adfb4a8ac62b9798d67ac592
2021-06-01 11:45:54 +00:00
Galia Peycheva
1dfd948440 Merge "Fix dream not working on top of pinned apps" into sc-dev 2021-06-01 10:23:53 +00:00
Kriti Dang
d7638021ed Merge "Adding additional javadocs for setSurroundFormatEnabled" into sc-dev 2021-06-01 10:11:54 +00:00
Aaron Huang
10cbb66f1e Merge "Make sure the PAC script content is sent again" into sc-dev 2021-06-01 08:47:13 +00:00
Wei Sheng Shih
4244ff3aa8 Merge "Ensure no starting window leak in WMShell before adding." into sc-dev am: a1195c85c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14341155

Change-Id: Ic806e0c7dd36a2c1f7f7b1180fe2d0869b95bf85
2021-06-01 08:25:05 +00:00
Alex Johnston
c65974f14e Merge "Remove requireAutoTime on upgrade" into sc-dev 2021-06-01 08:17:27 +00:00
Aaron Huang
2debdb3ec2 Merge "Remove IntDef annotations from NetworkPolicyManager" into sc-dev 2021-06-01 08:08:21 +00:00
Wei Sheng Shih
a1195c85c7 Merge "Ensure no starting window leak in WMShell before adding." into sc-dev 2021-06-01 07:56:40 +00:00
Aaron Huang
40b249c1a6 Make sure the PAC script content is sent again
...when the PAC service crashes.

Bug: 185409199
Test: manual
Original-Change: https://android-review.googlesource.com/1711211
Merged-In: Ic76428f42f37f8552a526190764ad32e2874adb0
Change-Id: Ic76428f42f37f8552a526190764ad32e2874adb0
2021-06-01 07:33:01 +00:00
TreeHugger Robot
3976945b9a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 75d739ff27 -s ours am: 947270efc3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5a27d488689cd22dd66fd8601be7bb1a43b99755
2021-06-01 07:17:26 +00:00
TreeHugger Robot
947270efc3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 75d739ff27 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8a88f0af4607b01760981889c6fbdd84f8a8be6e
2021-06-01 06:52:32 +00:00
TreeHugger Robot
75d739ff27 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-01 06:31:40 +00:00
TreeHugger Robot
15bb1b06fd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a3baa739ab -s ours
am skip reason: subject contains skip directive

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

Change-Id: I23035e73cabb808c070d881eae8d1f3bd02d3ea7
2021-06-01 06:21:20 +00:00
TreeHugger Robot
1e13aafb40 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 0fac4b5f27 -s ours am: 3dce19b16d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I28e10eb302b3ddeeafba7a1296b4a803efd9d9bc
2021-06-01 06:21:17 +00:00
TreeHugger Robot
a1f010604f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: eee72b4605 -s ours am: 3db4dc09ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: I093bb17f704a7a44b8d99226aecbce13233287ec
2021-06-01 06:21:14 +00:00
TreeHugger Robot
17e3cae38d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 863a81ff67 -s ours am: 9a32f30094 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5a3dd38beadae63aca54c22bbcb91986ac4fc947
2021-06-01 06:21:09 +00:00
TreeHugger Robot
b17e49885f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 638d1924ed -s ours am: 928b1e8347 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1712ef8d1882bde5ef6b6333a338fbc34d3f5481
2021-06-01 06:21:03 +00:00
TreeHugger Robot
088a08fb5e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 5030dc3ff7 -s ours am: 5c9d4bc279 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0654ef5cc1af5621eaffdf855f1338645dfc9378
2021-06-01 06:20:52 +00:00
TreeHugger Robot
bca26d3212 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: eb7d47937b -s ours am: 2859febee5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idd97a7bf56bbdbcebb6c1cc0119a1c17419a1f6f
2021-06-01 06:20:44 +00:00
TreeHugger Robot
a3baa739ab Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-01 06:15:35 +00:00