Commit Graph

71906 Commits

Author SHA1 Message Date
Robert Carr
03bdbb5f7b Merge "SurfaceView: Reset window stopped state when attaching to window." into oc-dev am: 97bcf59fce
am: 14395f81a3

Change-Id: I2bc4bd531f5bd26905f5c5ab87be1e986a853b3b
2017-05-16 22:13:04 +00:00
Robert Carr
14395f81a3 Merge "SurfaceView: Reset window stopped state when attaching to window." into oc-dev
am: 97bcf59fce

Change-Id: If55aff3522f664ad5edf7c282a211b5b65958c73
2017-05-16 22:03:11 +00:00
TreeHugger Robot
97bcf59fce Merge "SurfaceView: Reset window stopped state when attaching to window." into oc-dev 2017-05-16 21:51:28 +00:00
Jakub Pawlowski
45da7141b1 Merge "Merge "Discover primary service by UUID for PTS tests (4/4)" am: abb732fc40 am: 7e80b882b7 am: 23105d57d5" into oc-dev-plus-aosp
am: 4df112a54c

Change-Id: Ie6a2b3a54db56c607c51772592fdc2b44a108c63
2017-05-16 21:16:15 +00:00
Jakub Pawlowski
9fd4462c09 Merge "Discover primary service by UUID for PTS tests (4/4)" am: abb732fc40 am: 7e80b882b7
am: 23105d57d5

Change-Id: I764d8b206940a39906c6793fef24e6d5b19a8589
2017-05-16 20:55:37 +00:00
Jakub Pawlowski
23105d57d5 Merge "Discover primary service by UUID for PTS tests (4/4)" am: abb732fc40
am: 7e80b882b7

Change-Id: I048c7b1ca915744da1e06e0280be125e7da2b796
2017-05-16 20:40:58 +00:00
Treehugger Robot
abb732fc40 Merge "Discover primary service by UUID for PTS tests (4/4)" 2017-05-16 20:20:19 +00:00
Felipe Leme
372345330c Merge "Check for mAttachInfo nullness when getting the autofillable drawable." into oc-dev am: 83478acb87
am: bf63615ca5

Change-Id: Iaa7281637aa36cad4d478b73e8daa79dd2d29af3
2017-05-16 20:01:09 +00:00
Felipe Leme
bf63615ca5 Merge "Check for mAttachInfo nullness when getting the autofillable drawable." into oc-dev
am: 83478acb87

Change-Id: I927894efbe0dbe506b18d42cd1840596299a0270
2017-05-16 19:49:35 +00:00
Jorim Jaggi
802e97b184 Merge "Optimize hot launching recents" into oc-dev
am: cb414be017

Change-Id: I8b9004a482b70b86b53d43cf7f4dd5fc0bd1d842
2017-05-16 19:46:54 +00:00
TreeHugger Robot
83478acb87 Merge "Check for mAttachInfo nullness when getting the autofillable drawable." into oc-dev 2017-05-16 19:38:36 +00:00
Jorim Jaggi
cb414be017 Merge "Optimize hot launching recents" into oc-dev 2017-05-16 19:34:52 +00:00
Jeremy Joslin
957bdf0e61 Merge "Remove deprecated recommendation request code." into oc-dev am: b2bd32929b
am: 964cddccda

Change-Id: I0f30175b3be0d6a66fccd736ec5962f893cb2d9e
2017-05-16 19:23:52 +00:00
Jeremy Joslin
964cddccda Merge "Remove deprecated recommendation request code." into oc-dev
am: b2bd32929b

Change-Id: I0efb561f7829598eb5a509474e1a6e54e00bb93d
2017-05-16 19:02:40 +00:00
TreeHugger Robot
b2bd32929b Merge "Remove deprecated recommendation request code." into oc-dev 2017-05-16 18:44:28 +00:00
Jakub Pawlowski
fe2bf16a2b Discover primary service by UUID for PTS tests (4/4)
Bug: 38123054
Test: manual
Change-Id: I89e088e60f4325f1ece59d22efda0c907a3b716a
2017-05-16 11:37:00 -07:00
TreeHugger Robot
31ee03b05e Merge "Fix regression in getSharedPreferences performance" 2017-05-16 18:36:43 +00:00
Felipe Leme
354587a972 Check for mAttachInfo nullness when getting the autofillable drawable.
Test: manual verification on Caviar (automated test will be added later)
Test: CtsAutoFillServiceTestCases pass

Bug: 38341498
Fixes:  38323841

Change-Id: I15cc792de87987cc19a229c2ab2dfc317877f7ec
2017-05-16 10:38:41 -07:00
TreeHugger Robot
ffa79fb26b Merge "Optimize hot launching recents" 2017-05-16 17:15:22 +00:00
Rubin Xu
321063daa1 Merge "Invoke BLKSECDISCARD to securely delete sensitive data" into oc-dev
am: 28f0fd7a2d

Change-Id: I9e0ffce82703793004b6900db39ad7b5c5500ec3
2017-05-16 16:35:16 +00:00
TreeHugger Robot
28f0fd7a2d Merge "Invoke BLKSECDISCARD to securely delete sensitive data" into oc-dev 2017-05-16 16:26:47 +00:00
Aurimas Liutikas
01e1b8550d Merge "Remove internal listener when cloning" into oc-dev am: a7dde34a81
am: c59f75af1d

Change-Id: Ia44c46f0784c412d71956c9e7f1e17533c991b9c
2017-05-16 16:00:56 +00:00
Aurimas Liutikas
c59f75af1d Merge "Remove internal listener when cloning" into oc-dev
am: a7dde34a81

Change-Id: Ieac61647ed17450141516473768b8881ecfa072b
2017-05-16 15:51:07 +00:00
Aurimas Liutikas
a7dde34a81 Merge "Remove internal listener when cloning" into oc-dev 2017-05-16 15:43:50 +00:00
Jorim Jaggi
34795e3197 Optimize hot launching recents
Rearrange how we generate the transition specs, which involves
creating a thumbnail on the mainthread (about 10ms on large
devices): First, we put launching the activity onto a handler
thread (with default priority), to free up the main thread. Then,
we immediately start generating the thumbnail such that when the
future calls us we have the generated spec already handy.

For that we need to be able to supply a specs future into
ActivityOptions, to avoid race conditions. Furthermore we need to
make sure not to call into WM while creating specs, to avoid WM
lock contention.

Test: App -> Recents -> Same app, inspect app transition logs
Test: Double tap recents for quick switching

Bug: 32668632
Change-Id: I6001e29145f8e56deb9c4ead46c53c87c9191436
Merged-In: Ic6ec65c2560f67cade3b5ddde9f79ee13e9ba32c
2017-05-16 17:28:40 +02:00
Jorim Jaggi
cf4411df43 Optimize hot launching recents
Rearrange how we generate the transition specs, which involves
creating a thumbnail on the mainthread (about 10ms on large
devices): First, we put launching the activity onto a handler
thread (with default priority), to free up the main thread. Then,
we immediately start generating the thumbnail such that when the
future calls us we have the generated spec already handy.

For that we need to be able to supply a specs future into
ActivityOptions, to avoid race conditions. Furthermore we need to
make sure not to call into WM while creating specs, to avoid WM
lock contention.

Test: App -> Recents -> Same app, inspect app transition logs
Test: Double tap recents for quick switching

Bug: 32668632
Change-Id: Ic6ec65c2560f67cade3b5ddde9f79ee13e9ba32c
2017-05-16 17:26:54 +02:00
George Mount
beece1ae4b Merge "Fix back stack problems due to postponed transitions" into oc-dev am: ce50eb2d17
am: c091a649ad

Change-Id: If14705a262ea3ee35d626f7e3d2deb6ddc035682
2017-05-16 14:47:40 +00:00
George Mount
c091a649ad Merge "Fix back stack problems due to postponed transitions" into oc-dev
am: ce50eb2d17

Change-Id: I8ef9d7f968541dea17198aac89441f2617fab828
2017-05-16 14:37:23 +00:00
Android Build Merger (Role)
e701ade39d Merge "Merge "Fixes crash (race cond) when using toast that is immediately cancelled" into oc-dev am: 2df0155a97 am: c4996bd89c" 2017-05-16 14:34:00 +00:00
Svet Ganov
f137102968 Merge "Fixes crash (race cond) when using toast that is immediately cancelled" into oc-dev am: 2df0155a97
am: c4996bd89c

Change-Id: I6ab834ef0b291e24cdc67b885bcd5c6230a82cb1
2017-05-16 14:32:58 +00:00
TreeHugger Robot
76700b56ec Merge "ConnectivityManager: fix documentation" 2017-05-16 14:31:28 +00:00
Svet Ganov
c4996bd89c Merge "Fixes crash (race cond) when using toast that is immediately cancelled" into oc-dev
am: 2df0155a97

Change-Id: I6cb947b8c42298c7cff1932031faec362b99a354
2017-05-16 14:26:00 +00:00
TreeHugger Robot
b05e8176bb Merge "Invoke BLKSECDISCARD to securely delete sensitive data" 2017-05-16 14:23:06 +00:00
TreeHugger Robot
ce50eb2d17 Merge "Fix back stack problems due to postponed transitions" into oc-dev 2017-05-16 14:22:08 +00:00
TreeHugger Robot
2df0155a97 Merge "Fixes crash (race cond) when using toast that is immediately cancelled" into oc-dev 2017-05-16 14:16:01 +00:00
Hugo Benichi
bd4317f754 Merge "Remove unused import in ConnectivityManager" am: db6fc1afe8 am: fe098f8207 am: e13c192d0f
am: 36d913c7b9

Change-Id: I455d9712ad7f60f7474077435ff977c95b3b48c3
2017-05-16 13:34:37 +00:00
Hugo Benichi
36d913c7b9 Merge "Remove unused import in ConnectivityManager" am: db6fc1afe8 am: fe098f8207
am: e13c192d0f

Change-Id: Ib8368c5a8538914cba2723368c03618401ac159f
2017-05-16 13:25:09 +00:00
Hugo Benichi
e13c192d0f Merge "Remove unused import in ConnectivityManager" am: db6fc1afe8
am: fe098f8207

Change-Id: I64a2a607769d7194161e7728465c38cabbfa9345
2017-05-16 13:18:33 +00:00
Rubin Xu
ee67b61bb0 Invoke BLKSECDISCARD to securely delete sensitive data
Bug: 34600579
Test: manual - change device lock under synthetic password, verify
      old data on disk is erased.

Change-Id: I247bd1f095dd27335e671981f9e2d77e149af84f
Merged-In: I247bd1f095dd27335e671981f9e2d77e149af84f
2017-05-16 13:30:05 +01:00
Rubin Xu
aa32d15305 Invoke BLKSECDISCARD to securely delete sensitive data
Bug: 34600579
Test: manual - change device lock under synthetic password, verify
      old data on disk is erased.

Change-Id: I247bd1f095dd27335e671981f9e2d77e149af84f
2017-05-16 12:44:02 +01:00
Svet Ganov
0df3702f53 Fixes crash (race cond) when using toast that is immediately cancelled
Running cancel after toast is shown and adding some UI stress (or sleep
on UI thread) causes a crash from toast when trying to add the toast
window to the display. The toast must be triggered from app that is
above N MR1 (25).

The steps that crash the app are:
1. Show toast (Toast.makeText(...).show()), window token is created
2. Immediately cancel toast (Toast.cancel()), window token is removed
3. Stall UI thread (Thread.sleep, heavy task), both show and cancel
events are queued to UI thread from window manager
4. Crash trying to add toast but no window token exists

In Toast:handleShow(), the mNextView is required to add the toast to
display, if the mNextView is null before posting to window manager, then
when handleShow() runs later, it will ignore adding the toast to
display. The issue before is that mNextView is set to null after cancel
runs back from window manager in UI thread but the show post will always
happen first. Therefore set mNextView to null at the beginning of
cancel will ignore adding the toast to display and avoid the crash.

Bug: 37606432

Test: manual - write an app to Toast.show(), Toast.cancel(), then
Thread.sleep(), set app's sdk usage above 25 (N MR1) and show the
toast

Change-Id: I352e296c47b1b8776c78b6b0943b1dc809963026
2017-05-15 23:46:21 -07:00
Ian Pedowitz
52e33eed24 Merge "Revert "Revert "O is API 26""" into oc-dev am: 655ab3f59b
am: b6290ff39e

Change-Id: If4c21c8d37d753b00e4478c21bf5e6dbe9f39288
2017-05-16 05:04:15 +00:00
Ian Pedowitz
b6290ff39e Merge "Revert "Revert "O is API 26""" into oc-dev
am: 655ab3f59b

Change-Id: I28655c728468f2348b2ba83b77f2aae3d7b22c06
2017-05-16 04:02:51 +00:00
Ian Pedowitz
655ab3f59b Merge "Revert "Revert "O is API 26""" into oc-dev 2017-05-16 03:33:05 +00:00
Hugo Benichi
d5ad3e8a0c Remove unused import in ConnectivityManager
This makes the pre-upload verification pass.

Test: no functional change.
Change-Id: I6beccea10ccfcb39d975cb8f6f34fc9d79f1e170
2017-05-16 11:39:08 +09:00
Hugo Benichi
e2d48ff57c ConnectivityManager: fix documentation
Documentation pointing to the registerNetwork() overload including a
timeout argument was pointing to the version removed by commit
15fd4395e1. This makes it impossible to
cherry pick 15fd4395e1 due to the linter
complaining about unresolvable links.

This patch fixes the documentation to point to the registerNetwork()
with argument types NetworkRequest, NetworkCallback, int, in that order.

Bug: 36370941
Test: no functional change
Change-Id: Ieaf58f81d89fdf63f480fd15e65ed52822fc4f51
2017-05-16 11:36:24 +09:00
Aurimas Liutikas
4adf179816 Merge "Update TimePicker mode switch icon." into oc-dev am: 1812e446e1
am: 3ff9b30724

Change-Id: Idb7d538321c349d3d7b237df72d25e1d3fd9ff7a
2017-05-16 01:49:46 +00:00
Svet Ganov
647dc84560 Merge "Support recursive static shared lib dependency" into oc-dev am: e04765998e
am: 8adfc2cac7

Change-Id: Ib07a986a02372d40ce93b9beb8e1ac74f0d3561b
2017-05-16 01:38:57 +00:00
Rob Carr
93d5c06222 Merge "Preserve non-floating state when entering pinned stack." into oc-dev am: f5b6818009
am: dff4323f01

Change-Id: Ie007a26d4d0264f5a0609cbc0996a5a509734382
2017-05-16 01:28:14 +00:00
Aurimas Liutikas
3ff9b30724 Merge "Update TimePicker mode switch icon." into oc-dev
am: 1812e446e1

Change-Id: I8289ec34bef3f03a0fac671208e7257b547e49e1
2017-05-16 01:19:47 +00:00