Commit Graph

94766 Commits

Author SHA1 Message Date
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
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
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
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
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
Kevin Hufnagle
21083088e9 Merge "docs: Fixed link in setCurrentTab() description" into qt-dev
am: 2839f24e64

Change-Id: I4d888ec589953a02238520de0594d751fda3e6d0
2019-07-22 15:23:56 -07:00
Kevin Hufnagle
3eac945cb6 Merge "docs: Fixed link in setCurrentTab() description" into qt-dev
am: 2839f24e64

Change-Id: Ie058fa4312e0ee5e411ee0d0a2f0e49c5362c7c2
2019-07-22 15:23:56 -07:00
Kevin Hufnagle
2839f24e64 Merge "docs: Fixed link in setCurrentTab() description" into qt-dev 2019-07-22 22:01:49 +00:00
Nick Cook
9a2dbf3c80 Merge "docs: Fix broken link." into qt-dev am: 2aec022fd2
am: 3fd9f9aaf9

Change-Id: Id88ae5b1c60c07643b004a633fc0c7459aeba49c
2019-07-22 10:53:26 -07:00
Nick Cook
3fd9f9aaf9 Merge "docs: Fix broken link." into qt-dev
am: 2aec022fd2

Change-Id: I7a3c62f0259757be3921b2c8f6b8a2e3d6aa0bd7
2019-07-22 10:44:42 -07:00
Nick Cook
82252f17d3 Merge "docs: Fix broken link." into qt-dev
am: 2aec022fd2

Change-Id: I52cd7a41c34a1f44b427029c651c29912b36da93
2019-07-22 10:43:27 -07:00
Nick Cook
2aec022fd2 Merge "docs: Fix broken link." into qt-dev 2019-07-22 17:24:07 +00:00
Mathew Inwood
3020e050d0 resolve merge conflicts of 9acd72c60b to stage-aosp-master
Bug: None
Test: TH
Merged-In: I2fcf25264c62acc801f9e62967072cd04e4641e7
Change-Id: I5bc6b8c20bda03b3760f13f747b1e2069bfd9ac1
2019-07-22 09:29:24 +00:00
Lucas Dupin
d3dcd040e0 Merge "Fixed the layout of media heads up notifications" into qt-r1-dev
am: bddf774dd1

Change-Id: I69a46eb5b09d95fdc73ec2848e5198c6cd339c30
2019-07-19 12:19:56 -07:00
Lucas Dupin
bddf774dd1 Merge "Fixed the layout of media heads up notifications" into qt-r1-dev 2019-07-19 18:50:28 +00:00
Nick Cook
fc53f95cf8 Merge "docs: Fix broken link." into qt-dev am: a2fe3be17d
am: d0a4a594c5

Change-Id: I7b51ae46bbe26d888f9cb541244c2024c3833698
2019-07-19 10:23:35 -07:00
Nick Cook
4190144c27 Merge "docs: Fix broken link." into qt-dev
am: a2fe3be17d

Change-Id: I99943186126549eb9ce1269e619792e619c84bab
2019-07-19 10:16:48 -07:00
Nick Cook
d0a4a594c5 Merge "docs: Fix broken link." into qt-dev
am: a2fe3be17d

Change-Id: I8618dd139fedc0af13bdb6e00b441b237a319784
2019-07-19 10:15:39 -07:00
Selim Cinek
16f334e5c1 Fixed the layout of media heads up notifications
Previously the heads up layout was strangely clipped
because we were using the expanded layout.
We're now using the collapsed layout instead. In order to allow this,
the media notification needs to wrap it's height properly.

Fixes: 136507638
Test: show heads up media notification
Change-Id: Ib091b0e776b5cd1a615c9ea0121a3115817b7f64
2019-07-18 18:11:54 -07:00
Lucas Dupin
c229a940cb Merge "Disable bypass and bouncer delay when no face auth" into qt-r1-dev
am: f41cc30658

Change-Id: I367b3ef7d3a596e15972af1f047fd291f92e56b0
2019-07-18 17:20:17 -07:00
Nick Cook
42ece979a2 docs: Fix broken link.
Test: make ds-docs

Bug: 132635673
Change-Id: I9e6a493112418f7b1467d9d2926a1b2c106d4ad0
2019-07-18 21:44:50 +00:00