Commit Graph

11372 Commits

Author SHA1 Message Date
Christian Wailes
aa85aac5e2 Merge "Fixes two data races in USAP pool management." into qt-dev-plus-aosp
am: bc5237a4f1

Change-Id: I62f7e9636c40fe38bc7d860a572024a8dccd3fb3
2019-06-07 17:40:03 -07:00
Chris Wailes
f68c4e2ffa Fixes two data races in USAP pool management.
The USAP pool management code contained two data races.  One could cause
a double decrement if a runtime thread executed the SIGCHLD handler
while the server was responding to a pool exit message from a USAP.  The
other data race could occur when the SIGCHLD handler executed in the
middle of a USAP pool flush.

The solution to the first race is to change the return value from a
helper function to ensure that the decrement only occurs when the entry
is invalidated through that specific invocation of the helper.

The second data race was fixed by using SIGTERM instead of SIGKILL when
flushing the USAP pool.  This allows the Zygote to clear the table
entries outside of the SIGCHLD handler, and the handler to avoid
duplicate bookkeeping cleanup when this occurs.  SIGTERM is used so that
it can be differentiated from other process termination events and so
that it can be blocked while the USAP is specializing, but hasn't yet
informed the Zygote of it's removal from the pool.  This issue and this
fix will no longer be necessary once the Zygote signal handler has been
replaced with a signalfd.

Bug: 132794985
Test: atest SignedConfigHostTest
Change-Id: Ie01637a10b356b80b5aa62291a97f2c167242827
Merged-In: Ie01637a10b356b80b5aa62291a97f2c167242827
(cherry picked from commit fb329ba7c8)
2019-06-07 16:51:48 -07:00
Benedict Wong
27e91edd6b Revert "Take all VPN underlying networks into account when migrating traffic for" am: ac06c1022d
am: f0904ebfc0

Change-Id: I2695c296398aeb6e5378bba0c89c8ae0b3cd55c6
2019-06-07 02:43:33 -07:00
Benedict Wong
f0904ebfc0 Revert "Take all VPN underlying networks into account when migrating traffic for"
am: ac06c1022d

Change-Id: Ie9e830962e702c5e66faa7239e6c5037ed3d791d
2019-06-07 02:33:33 -07:00
Benedict Wong
ac06c1022d Revert "Take all VPN underlying networks into account when migrating traffic for"
This reverts commit 917327b193.

Reason for revert: This change has been implicated in 4-way deadlocks as seen in b/134244752.

Bug: 134244752
Change-Id: Ibdaad3a4cbf0d8ef1ed53cfab1e454b9b878bae9
2019-06-07 09:18:01 +00:00
Yiwei Zhang
06936fcb48 Merge "Decouple Game Driver from preloading graphics driver" into qt-dev am: 1f66726d08
am: d480e6a0f7

Change-Id: I908bee821a44fd1ec8223166d52f81cc682e9e43
2019-06-06 16:19:42 -07:00
Yiwei Zhang
d480e6a0f7 Merge "Decouple Game Driver from preloading graphics driver" into qt-dev
am: 1f66726d08

Change-Id: I77846d647f3f77f6af325f85a6a229d6c3c8d085
2019-06-06 16:14:39 -07:00
Yiwei Zhang
9f7df41b4f Merge "Decouple Game Driver from preloading graphics driver" into qt-dev
am: 1f66726d08

Change-Id: I3a0a6d74a42721088ab2f4ecac0f474cb6ba4d5f
2019-06-06 16:13:41 -07:00
TreeHugger Robot
1f66726d08 Merge "Decouple Game Driver from preloading graphics driver" into qt-dev 2019-06-06 22:54:21 +00:00
Govinda Wasserman
8ff4110369 Merge "Improves the REMINDER_EXP mode for Assist Handle behavior" into qt-dev am: 4335d958e4
am: 2c594ee9b6

Change-Id: I82d2fe14385d936292fb91aefc9ea61d8ee77057
2019-06-06 15:12:11 -07:00
Govinda Wasserman
fb95617030 Merge "Improves the REMINDER_EXP mode for Assist Handle behavior" into qt-dev
am: 4335d958e4

Change-Id: Ic82e2b8dfe171fb8274bf3c58f569978427ad654
2019-06-06 15:06:04 -07:00
Govinda Wasserman
2c594ee9b6 Merge "Improves the REMINDER_EXP mode for Assist Handle behavior" into qt-dev
am: 4335d958e4

Change-Id: I72309c3d7a2a71ac7c298a2504e0995d5135d865
2019-06-06 15:05:58 -07:00
TreeHugger Robot
4335d958e4 Merge "Improves the REMINDER_EXP mode for Assist Handle behavior" into qt-dev 2019-06-06 21:50:28 +00:00
Govinda Wasserman
48cdd68afe Improves the REMINDER_EXP mode for Assist Handle behavior
- User learning state is reset when leaving REMINDER_EXP behavior.
- Default parameters updated for easier testing and better experience
- Show and go only performed once per day when gesture has been learned
- Slightly delay handle showing when entering an apps with a longer
  delay when switching between apps rapidly.
- Adds state dump to improve debugability.
- Adds ability to suppress handle showing in specific states using
  flags.

Test: atest AssistHandleBehaviorControllerTest
Test: Tested locally
BUG:132983599
Change-Id: I7829ad55d7667f5db3633e702add709968dcd0a9
2019-06-06 16:24:35 -04:00
Fabian Kozynski
efc4b3a7ee DO NOT MERGE Revert "DO NOT MERGE Remove Privacy Indicators"
am: 53ceaf677a

Change-Id: I2e50419314824c17dd1086c2e6dcb9e9e63590fa
2019-06-06 13:06:49 -07:00
Fabian Kozynski
005993172f Merge "DO NOT MERGE Revert "DO NOT MERGE Remove Privacy Indicators"" into qt-r1-dev 2019-06-06 19:45:20 +00:00
Adrian Roos
022edb5592 Merge "GestureNav: Fix broken split screen navbar" into qt-dev am: 730b22c229
am: 4bbb1a7378

Change-Id: I6e15eecad9aa9d8426be554f3d6bdf40ae53f5a7
2019-06-06 09:33:19 -07:00
Adrian Roos
4bbb1a7378 Merge "GestureNav: Fix broken split screen navbar" into qt-dev
am: 730b22c229

Change-Id: Ib32bf8cc6f8c4385ff2fc597f528b98b645f7f6e
2019-06-06 09:28:20 -07:00
Adrian Roos
e8fa8c6230 Merge "GestureNav: Fix broken split screen navbar" into qt-dev
am: 730b22c229

Change-Id: Icef93a6bf78f8a25c9ba307bfd56e17f28407a79
2019-06-06 09:28:18 -07:00
TreeHugger Robot
730b22c229 Merge "GestureNav: Fix broken split screen navbar" into qt-dev 2019-06-06 16:09:25 +00:00
Yiwei Zhang
6100c70d58 Decouple Game Driver from preloading graphics driver
Previously, when the Game Driver package name is set, graphics driver preloading
is automatically disabled. Now we'd like to decouple the relation here. So Game
Driver could still work no matter graphics driver is preloaded in Zygote or not.

Bug: 134526352
Test: build, flash and boot.
Change-Id: Id720cc11e3365423dd9b984b7d30a2dbeecb6116
2019-06-05 15:56:10 -07:00
Lucas Dupin
0b74f4bfa7 Merge "Fix flaky test" into qt-r1-dev
am: 7bfbb7e0a7

Change-Id: I78842caa898ca19b7a0ba27f255d7ee27e906eac
2019-06-05 15:51:38 -07:00
Makoto Onuki
20fdf56569 Merge "Avoid creating multiple death recipients for same observer" into qt-dev am: a478c5f9aa
am: f574979713

Change-Id: Ic3e2adf8073dab7f35239b1dfe40e579903e7810
2019-06-05 09:16:34 -07:00
Makoto Onuki
f574979713 Merge "Avoid creating multiple death recipients for same observer" into qt-dev
am: a478c5f9aa

Change-Id: I66242d7ce6acdd9850965328ffa79e9b1a2e8f4d
2019-06-05 09:08:37 -07:00
Makoto Onuki
3c36699987 Merge "Avoid creating multiple death recipients for same observer" into qt-dev
am: a478c5f9aa

Change-Id: Id856368d4da90c4efb660ee4598b7d2ae4a75dc7
2019-06-05 09:08:36 -07:00
Makoto Onuki
a478c5f9aa Merge "Avoid creating multiple death recipients for same observer" into qt-dev 2019-06-05 15:54:05 +00:00
Lucas Dupin
7bfbb7e0a7 Merge "Fix flaky test" into qt-r1-dev 2019-06-05 15:37:29 +00:00
Matt Pietal
3efac1e507 Merge "Sharesheet - Adjust button bar insets" into qt-dev am: 83375a391c
am: 77a4ce2015

Change-Id: I706e05838e6d2e49f0263c7635d1c2c0add021b6
2019-06-05 06:23:50 -07:00
Matt Pietal
77a4ce2015 Merge "Sharesheet - Adjust button bar insets" into qt-dev
am: 83375a391c

Change-Id: I7a3c30dd216d2b5ad39327244cca4797e8eae28b
2019-06-05 06:19:14 -07:00
Matt Pietal
5e0e38c7f4 Merge "Sharesheet - Adjust button bar insets" into qt-dev
am: 83375a391c

Change-Id: I1ecd70053caef327025d628bc1e4df5725ec83f2
2019-06-05 06:18:50 -07:00
Matt Pietal
78fdbd492f Sharesheet - Adjust button bar insets
Button bar insets were set before the inset callback. Add a call to
layout the button bar during the inset callback.

Bug: 134472146
Test: Steps from defect
Change-Id: I0246f06315cd05343002071dd6d217d41e0059ca
2019-06-05 07:09:17 -04:00
Lucas Dupin
5febf7eb6b Fix flaky test
Test was registering a listener, and events could come from wallpaper
manager making it unstable.

Fixes: 134485306
Test: atest SysuiColorExtractorTests
Change-Id: Ie838cbee0887f3503ce328d5c5b5603c413d5458
2019-06-04 20:47:29 -07:00
Hui Yu
47d968bebb Merge "Only set mStartClockTime when device is fully charged." into qt-dev am: 28d28a4ee5
am: 33add786a6

Change-Id: Ic5f8e1de1ab227a631af9564dfcc1fc0054c2612
2019-06-04 19:26:49 -07:00
Hui Yu
33add786a6 Merge "Only set mStartClockTime when device is fully charged." into qt-dev
am: 28d28a4ee5

Change-Id: Ied83bb528362c96477c365b60f00a301d7de39d6
2019-06-04 18:40:22 -07:00
Hui Yu
c1dceabb36 Merge "Only set mStartClockTime when device is fully charged." into qt-dev
am: 28d28a4ee5

Change-Id: I902918ae0523e9a1c57bf4d867cd4d17847b4867
2019-06-04 18:20:04 -07:00
Makoto Onuki
ad1291e749 Avoid creating multiple death recipients for same observer
Also do a WTF when the same process registers 1000 observers with the
same observer instance.

Fix: 133388082
Test: manual test: Launch leaky app and make sure WTF is raised
Test: manual test: Open contacts app, close, and make sure the
"Total number of unique observers" goes back
Test: manual test: Open contacts app, kill it, and make sure the
"Total number of unique observers" goes back
Test: manual test: Open contacts app while contacts are syncing,
and make sure the activity refreshes itself.
Test: atest cts/tests/tests/content/src/android/content/cts/ContentResolverTest.java
Test: atest FrameworksCoreTests:BinderDeathDispatcherTest
Test: atest FrameworksServicesTests:com.android.server.content.ObserverNodeTest

Change-Id: Id738ca66023c029b92db3d108d99a9fc240fe77c
2019-06-04 17:06:39 -07:00
Hui Yu
28d28a4ee5 Merge "Only set mStartClockTime when device is fully charged." into qt-dev 2019-06-04 21:59:52 +00:00
Fabian Kozynski
53ceaf677a DO NOT MERGE Revert "DO NOT MERGE Remove Privacy Indicators"
This reverts commit ec3e0ecaca.

Reason for revert: Re-enable Privacy Indicators in qt-r1-dev
Bug: 133257910

Change-Id: I7c778dd76c0aff3f483cf06f1dd96fd067145c12
2019-06-04 16:37:21 +00:00
Kevin Yao
712d5fd747 Merge "User education support on disambiguation dialog" into qt-dev am: 327751f18f
am: ece8f00c18

Change-Id: I99e41bc1cdd3a25e4884ba7ed7e77ab6bd7cf14e
2019-06-03 18:43:39 -07:00
Kevin Yao
0d2970d912 Merge "User education support on disambiguation dialog" into qt-dev
am: 327751f18f

Change-Id: I0ab37bd7b5cf4b00df4dc70d35a1387e3f348680
2019-06-03 18:40:43 -07:00
Kevin Yao
ece8f00c18 Merge "User education support on disambiguation dialog" into qt-dev
am: 327751f18f

Change-Id: I10d527a237fa2c47d6bef193de8aa194f391c74b
2019-06-03 18:40:08 -07:00
Kevin Yao
327751f18f Merge "User education support on disambiguation dialog" into qt-dev 2019-06-04 01:29:21 +00:00
Hui Yu
5104da00aa Only set mStartClockTime when device is fully charged.
The mStartClockTime represents the time device is fully charged.
Currently mStartClockTime is set again whenever the device clock
changes. Since the device clock could change many times, we lost
original mStartClockTime value, unreasonable mStartClockTime values
for example 26 days could be returned (because the device clock changes)
when getStartClockTime() is called.

A better solution is to only set mStartClockTime when device is fully
charged, the value is persisted across device reboot. When getStartClockTime()
is called, we return adjusted value according to current time.

Change-Id: I49ded1519bc31daf1a51a572325cbbe67f1abd09
Fix: 132914064
Test: Manual test, checking Settings--Battery--Last full Charge
2019-06-03 14:18:32 -07:00
Matt Pietal
02b0c0e363 Sharesheet - Fix layouts for multi-window mode
am: 3e4b56f76c

Change-Id: Iaea89d07090efc03a831955753411432142d5890
2019-06-03 10:07:07 -07:00
Matt Pietal
fd93342bca Sharesheet - Fix layouts for multi-window mode am: 3e4b56f76c
am: 89cae6f776

Change-Id: Id4ebef4ccc0a9162bd7a702e45e8e5c3e0e75af9
2019-06-03 07:28:36 -07:00
Matt Pietal
89cae6f776 Sharesheet - Fix layouts for multi-window mode
am: 3e4b56f76c

Change-Id: I92f503df389a1f023f886ab4554ef436069548cd
2019-06-03 07:22:37 -07:00
Kevin Yao
9176f033d9 User education support on disambiguation dialog
Support Accessibility education according to
1. Gesture Navigation is on or off
2. Screen reader feature (such as TalkBack) is enabled or not
Manual test screenshot: https://drive.google.com/open?id=1afTDRYPMcZphM5cL0krPDA_Vh9pRX-8x

Bug: 133811747
Test: Manual
Change-Id: I04ca36c9e88ff14e29103db41cfab2a9b53985d5
2019-06-03 13:59:38 +00:00
Adrian Roos
faba406212 GestureNav: Fix broken split screen navbar
With gesture navigation, it no longer makes sense to force the navigation bar
to black in split screen, instead we can show the respective navbar backgrounds of
the applications.

Fixes: 130913061
Test: enable gesture navigation, enter splitscreen, observe that navigation bar backgrounds are properly drawn, also verify the same if IME is open.
Change-Id: If1464dd9cf0c5499c7c33caab06eb430fb59cb30
2019-06-03 14:46:51 +02:00
Matt Pietal
3e4b56f76c Sharesheet - Fix layouts for multi-window mode
When using multi-mode and holding the phone in portrait, android will
report it's orientation as LANDSCAPE. Take multi-window mode into
account when determining fixed widths as well as number of items per
row.

Bug: 132828939
Test: Use multi-window mode
Change-Id: I97b722ea58c9f79aea2a3ab594c3ad7d78f8607c
2019-06-03 07:08:22 -04:00
Hui Yu
eea9f11018 Merge "Do not create EMPTY batterystats history file." into qt-dev am: 04c3eeeaa0
am: 1bf565e95b

Change-Id: If55df6c770fdead996c68a3a348f41896c23b062
2019-05-31 20:49:23 -07:00