Commit Graph

104550 Commits

Author SHA1 Message Date
bsears
393caff3cb Merge "Revert "SharedMemory: break Cleaner reference cycle." Bug: 138422309" into qt-dev am: d4b0c9348a am: 868ac4f3a1
am: a53549d307

Change-Id: Ie7a0f95a0b260ecfdaf74d9637363c40b0550142
2019-07-26 17:20:07 -07:00
bsears
d15de9d187 Merge "Revert "SharedMemory: clear file descriptor when explicitly closed." Bug: 138422309" into qt-dev am: 480f1db9bc
am: 87216d7403

Change-Id: Ie6221fa2e0069b28284c37eea0a90327dd7164d6
2019-07-26 16:55:22 -07:00
bsears
868ac4f3a1 Merge "Revert "SharedMemory: break Cleaner reference cycle." Bug: 138422309" into qt-dev
am: d4b0c9348a

Change-Id: Icef464ff04de9d1e300161383251e35d557ca973
2019-07-26 16:35:31 -07:00
bsears
de6bfd230c Merge "Revert "SharedMemory: clear file descriptor when explicitly closed." Bug: 138422309" into qt-dev
am: 480f1db9bc

Change-Id: Ib346fb19a7be0635fe9e15d0fc6a307a614fb1c5
2019-07-26 16:31:52 -07:00
bsears
87216d7403 Merge "Revert "SharedMemory: clear file descriptor when explicitly closed." Bug: 138422309" into qt-dev
am: 480f1db9bc

Change-Id: I3ba90a97cc16bcf29c15073c252c382450ae4a71
2019-07-26 16:31:40 -07:00
Adam Seaton
b16411f83a Revert "SharedMemory: break Cleaner reference cycle."
Bug: 138422309

This reverts commit 390d9e6a18.

Reason for revert: crashes documented in b/138422309

Change-Id: I235f727d0fe87c09f6f05dddcae7759bab64dfd8
2019-07-26 17:17:16 +00:00
Adam Seaton
5966196515 Revert "SharedMemory: clear file descriptor when explicitly closed."
Bug: 138422309

This reverts commit 20ab1e3427.

Reason for revert: crashes documented in b/138422309

Change-Id: Ic9e33fdb24bad2b30f0eb357d6752c1834df41d5
2019-07-26 17:17:03 +00:00
Robert Chou
cc0eaa051d Merge "Resolve NumberPicker display abnormal issue." am: 434e4fdfdb am: 17c0df4aa4
am: b7d3ffef37

Change-Id: Ieef8f0cce3dff1fb0c92dea3700e6a7723805399
2019-07-25 20:50:29 -07:00
Robert Chou
b7d3ffef37 Merge "Resolve NumberPicker display abnormal issue." am: 434e4fdfdb
am: 17c0df4aa4

Change-Id: Idd61b68dc773114fe09fcd7f8aebd1043c1a838d
2019-07-25 20:40:29 -07:00
Robert Chou
17c0df4aa4 Merge "Resolve NumberPicker display abnormal issue."
am: 434e4fdfdb

Change-Id: I1d5711167309ce1cb65ddf24bdd8e6392d83bd40
2019-07-25 20:30:37 -07:00
Robert Chou
434e4fdfdb Merge "Resolve NumberPicker display abnormal issue." 2019-07-26 02:51:57 +00:00
Josh Gao
655d6f5cde Merge changes I8bdb4c74,I613a7d03 into qt-dev
am: a09ee2d39f

Change-Id: Ibcbc22b6f4f77825f16e52a832e28fcb40d3fa6d
2019-07-25 17:41:26 -07:00
Josh Gao
de90a881a7 Merge changes I8bdb4c74,I613a7d03 into qt-dev am: a09ee2d39f
am: 036d594c69

Change-Id: Ib925304a870e5d9881147eaa9831e57be4dda6a9
2019-07-25 17:33:51 -07:00
Josh Gao
036d594c69 Merge changes I8bdb4c74,I613a7d03 into qt-dev
am: a09ee2d39f

Change-Id: I6ae25d6b3aa39ef6f9ed1ffcf6fce6e5920a5578
2019-07-25 16:54:20 -07:00
Josh Gao
20ab1e3427 SharedMemory: clear file descriptor when explicitly closed.
We run the Cleaner in close, but after the fix in commit 6ca916a6, this
no longer clears the value stored in the FileDescriptor, which means
that subsequent operations on an explicitly closed SharedMemory will
operate on a bogus fd number. Clearing the FileDescriptor value in close
is sufficient, because Cleaner.clean is idempotent, and the only other
case where it executes is when the FileDescriptor is phantom reachable,
which means no one can access it to get its integer value.

Bug: http://b/138392115
Bug: http://b/138323667
Test: treehugger
Change-Id: I8bdb4c745466532a0712976416184c53fcf0dbf6
(cherry picked from commit a7641806dd)
2019-07-25 14:08:58 -07:00
Josh Gao
390d9e6a18 SharedMemory: break Cleaner reference cycle.
Previously, the Cleaner we create to close the ashmem file descriptor
used a thunk that held a strong reference to the FileDescriptor we
wanted to clean up, which prevented the Cleaner from ever running.

Break the cycle by storing the integer value of the file descriptor
instead.

Bug: http://b/138323667
Test: treehugger
Change-Id: I613a7d035892032f9567d59acb04672957c96011
(cherry picked from commit 6ca916a657)
2019-07-25 12:13:15 -07:00
Kalesh Singh
7faeb8c82f Merge "Get wakelock stats from SystemSuspend" am: dff4801d6b am: 7c7c466e1b
am: bd2c24e1d1

Change-Id: I27016c9f7cb7914f89f608ff0ba1b47d3c677579
2019-07-25 00:51:12 -07:00
Kalesh Singh
bd2c24e1d1 Merge "Get wakelock stats from SystemSuspend" am: dff4801d6b
am: 7c7c466e1b

Change-Id: I149f176165fda0ac02c890677a3c2e97459aaed3
2019-07-25 00:32:06 -07:00
Kalesh Singh
7c7c466e1b Merge "Get wakelock stats from SystemSuspend"
am: dff4801d6b

Change-Id: I96bda190d2935e3a21391e831d23f50526c8fc93
2019-07-25 00:21:12 -07:00
Treehugger Robot
dff4801d6b Merge "Get wakelock stats from SystemSuspend" 2019-07-25 07:02:25 +00:00
Josh Gao
90cc26920b Merge "SharedMemory: break Cleaner reference cycle." am: 5783a79cfc am: e9c55ddce1
am: 132b66b0c2

Change-Id: Ide4fbc059ceabf2028d57f5e5a9e7358dd88e7e5
2019-07-24 22:28:37 -07:00
Josh Gao
132b66b0c2 Merge "SharedMemory: break Cleaner reference cycle." am: 5783a79cfc
am: e9c55ddce1

Change-Id: I8444786cdde94c75e3711349bad812d514a58890
2019-07-24 22:17:45 -07:00
Josh Gao
e9c55ddce1 Merge "SharedMemory: break Cleaner reference cycle."
am: 5783a79cfc

Change-Id: I732fac88ccee02e49506dd40a7204e5210648b10
2019-07-24 22:08:03 -07:00
Treehugger Robot
5783a79cfc Merge "SharedMemory: break Cleaner reference cycle." 2019-07-25 04:40:22 +00:00
Vadim Caen
d6aa056512 DO NOT MERGE Do not call drawableChanged pre Q am: 843f9dee8b
am: 2106ef79ad

Change-Id: Ic5ceb704346deb38d1151f0e1fdc79fbb28ff82d
2019-07-24 16:38:48 -07:00
Vadim Caen
605e74c930 DO NOT MERGE Do not call drawableChanged pre Q
am: 843f9dee8b

Change-Id: I813f41905386da06e6eaebd6b7f85c17a6051456
2019-07-24 16:19:39 -07:00
Vadim Caen
2106ef79ad DO NOT MERGE Do not call drawableChanged pre Q
am: 843f9dee8b

Change-Id: Id54fa3b2327faec88c936228109643c8425eeb2a
2019-07-24 16:17:49 -07:00
Jorim Jaggi
d007c7b90d Merge "DO NOT MERGE Do not call drawableChanged pre Q" into qt-dev 2019-07-24 22:49:21 +00:00
Josh Gao
6ca916a657 SharedMemory: break Cleaner reference cycle.
Previously, the Cleaner we create to close the ashmem file descriptor
used a thunk that held a strong reference to the FileDescriptor we
wanted to clean up, which prevented the Cleaner from ever running.

Break the cycle by storing the integer value of the file descriptor
instead.

Bug: http://b/138323667
Test: treehugger
Change-Id: I613a7d035892032f9567d59acb04672957c96011
2019-07-24 15:40:57 -07:00
Deqiang Chen
d7970a3326 Merge "Define intent for receive vendor specific response and define a function to send vendor AT command from Hfp client" am: a0b2086373 am: 92485e41b8
am: 171aa7255a

Change-Id: Idfd303d7112c3b9f7e91b9bcebaa7d6cc17f5125
2019-07-24 15:01:07 -07:00
Deqiang Chen
171aa7255a Merge "Define intent for receive vendor specific response and define a function to send vendor AT command from Hfp client" am: a0b2086373
am: 92485e41b8

Change-Id: I8f21765dc33187253ee93e571551939c40c6c928
2019-07-24 14:50:08 -07:00
Vadim Caen
843f9dee8b DO NOT MERGE Do not call drawableChanged pre Q
Some apps rely on not updating the window format when changing the
background of the DecorView. To keep the compatibilty with these app we
add only call DecoreView.drawableChanged() when the window background is
changed on app targetting Q and above.

Test: Manually test by lunching Instagram TV and pressing return twice.
The window should aninate with no flickering.
Bug: 136987724

Change-Id: I3593d30dc6f10519008151974e475f0dad86fc64
2019-07-24 21:29:12 +00:00
Deqiang Chen
92485e41b8 Merge "Define intent for receive vendor specific response and define a function to send vendor AT command from Hfp client"
am: a0b2086373

Change-Id: I4101b1119d583c8d45c0bbde6d1955b97176d656
2019-07-24 14:27:52 -07:00
Deqiang Chen
a0b2086373 Merge "Define intent for receive vendor specific response and define a function to send vendor AT command from Hfp client" 2019-07-24 21:04:55 +00:00
Dave Mankoff
f62794fab9 Merge "Allow BrightLineFalsingManager settings to be experimented with via Phenotype." into qt-dev
am: 8d56bbf2e3

Change-Id: I02f776454972a2b96744c02bad1de3b9e24e689c
2019-07-24 12:28:42 -07:00
Dave Mankoff
8d56bbf2e3 Merge "Allow BrightLineFalsingManager settings to be experimented with via Phenotype." into qt-dev 2019-07-24 19:09:02 +00:00
Dave Mankoff
e38da07841 Allow BrightLineFalsingManager settings to be experimented with via Phenotype.
This is a CP of http://ag/8687829

Bug: 138308096
Test: atest SystemUITests
Change-Id: I9e2b22b157c45da1606466acdfff3c5de7f182e1
Merged-In: I9fa4d1344bb184dea00f92f8d265667f0be11466
2019-07-24 18:37:11 +00:00
Selim Cinek
324bf3e6d1 Merge "Not asking for the password when dragging down and bypass" into qt-r1-dev
am: 87592617ec

Change-Id: Ifd782f3883c52b800228a4a5ca5171fe7f4dc390
2019-07-24 10:17:47 -07:00
Selim Cinek
87592617ec Merge "Not asking for the password when dragging down and bypass" into qt-r1-dev 2019-07-24 16:47:47 +00:00
Jack Yu
649b9abeb9 Merge "Create feature flags for OMAPI readers supportiveness" am: 65e73f09fd am: 3e2865f585
am: 4fffc3ebd8

Change-Id: If1bec0560af9c9173051f745d81e2c70e64988e8
2019-07-24 07:27:22 -07:00
Jack Yu
4fffc3ebd8 Merge "Create feature flags for OMAPI readers supportiveness" am: 65e73f09fd
am: 3e2865f585

Change-Id: I1c86601d6ee02619ee0d0cdad7cefd51e2a95989
2019-07-24 07:17:16 -07:00
Jack Yu
3e2865f585 Merge "Create feature flags for OMAPI readers supportiveness"
am: 65e73f09fd

Change-Id: I72b65959dab75fcca8566d6eecd7a730ef044d94
2019-07-24 07:02:39 -07:00
Treehugger Robot
65e73f09fd Merge "Create feature flags for OMAPI readers supportiveness" 2019-07-24 13:33:45 +00:00
Mingyan Liu
6234cd9c1a Resolve NumberPicker display abnormal issue.
Bugid: https://partnerissuetracker.corp.google.com/u/0/issues/138241751
Change-Id: Id5971e59d30506b0be2c5347a1e2dd4bb8371eaa
2019-07-24 07:53:38 +00:00
Winson Chung
932a656359 Merge "Modify deferred recents animation cancel to work without screenshot" into qt-r1-dev
am: 48e3cfc06a

Change-Id: Id491b61fc851779bd398c5113a306ce1c89181dc
2019-07-23 22:24:38 -07:00
Selim Cinek
abcc201afb Not asking for the password when dragging down and bypass
Instead we'll just keep them in there looking like locked
notifications.

Fixes: 138225058
Test: add notifications, enable dynamic privacy, drag down
Change-Id: Ica49035ba3fe655c145f81be962817ddd294c48d
2019-07-23 18:44:07 -07:00
Winson Chung
7a545ae9cc Modify deferred recents animation cancel to work without screenshot
- Allow the recents animation runner to request deferring a cancel from
  stack order change until the next app transition start without using
  a screenshot. This allows launcher to set this state, then start an
  activity without a flash due to the animation not finishing immediately
- Always prepare a transition when using the deferred cancel to ensure
  an app transition callback
- Handle app transition canceled as well (if canceled, we continue to
  cancel recents the animation with/without the screenshot as requested)
- Remove internal lock and use the global WM lock when setting the defer
  cancel state
- Renamed a few methods to clarify the deferred cancel flow

Bug: 137196872
Test: atest FrameworksServicesTests:RecentsAnimationControllerTest
Test: atest WmTests:RecentsAnimationTest
Change-Id: Ie8f6f60b6bf6777e36f24749b30f90c8c26ee848
2019-07-23 15:50:33 -07:00
Kalesh Singh
f166d19ebe Get wakelock stats from SystemSuspend
Read wakelock stats from SystemSuspend if possible else fallback to
/d/wakeup_source, /proc/wakelocks.

Bug: 128923994
Test: KernelWakelockReaderTest

Change-Id: I859092d53d7697a4940f9369480e203181f0c370
2019-07-23 09:40:31 -07:00
Jack Yu
18c7630c3d Create feature flags for OMAPI readers supportiveness
Bug: 131062577
Test: CTS OMAPI
Change-Id: I20c1159489ea0bd5cc9fb651914d6bfd2a6b25ca
2019-07-23 17:38:13 +08:00
Kevin Hufnagle
655931d20f Merge "docs: Fixed link in setCurrentTab() description" into qt-dev am: 2839f24e64
am: 21083088e9

Change-Id: I257f23f7a7a463d53f187fe36e4ce4208d2aa9eb
2019-07-22 15:37:02 -07:00