Commit Graph

412428 Commits

Author SHA1 Message Date
TreeHugger Robot
44de1187f5 Merge "Don't lock the profile after setting work challenge." 2019-04-03 16:58:31 +00:00
Josh Tsuji
d44902f52d Merge "Disable a flaky test, will fix later." 2019-04-03 16:46:15 +00:00
William Hester
b77ce74018 Merge "Ensure that THM sets up even when system dies" 2019-04-03 16:43:12 +00:00
Yifan Hong
3d98d51eae Merge "libmedia2_jni: link to libcgrouprc" 2019-04-03 16:41:20 +00:00
Joshua Tsuji
e567f07e7d Disable a flaky test, will fix later.
Test: Disabling a test
Change-Id: Ifc76fc8fc66ee57ebf87eedcad0e2474a19674da
2019-04-03 12:37:27 -04:00
Android Build Merger (Role)
c7cd1eb6eb Merge "Merge "Pass app's data dir to ART" am: 16749ac83e am: 33ed677361 am: 6277c39b0e" 2019-04-03 16:32:55 +00:00
TreeHugger Robot
26c73b0e0b Merge "Tweak bar chart measurement." 2019-04-03 16:32:48 +00:00
David Brazdil
278f199a73 Merge "Pass app's data dir to ART" am: 16749ac83e am: 33ed677361
am: 6277c39b0e

Change-Id: Iec85a2630e364e66e45e42f2cbb6a26008c0ab4a
2019-04-03 09:30:44 -07:00
TreeHugger Robot
ffd5fb6954 Merge "Support content description with app name" 2019-04-03 16:30:08 +00:00
Makoto Onuki
b0bca0c5f7 Merge "Improve CursorWindow failure message" 2019-04-03 16:19:28 +00:00
David Brazdil
6277c39b0e Merge "Pass app's data dir to ART" am: 16749ac83e
am: 33ed677361

Change-Id: I9a7c617f13dadc91b735837d1778e3d526be8520
2019-04-03 09:13:31 -07:00
Michael Wright
89df2a72f7 Merge "Expose input region monitoring to system components." 2019-04-03 16:04:03 +00:00
TreeHugger Robot
934a49270f Merge "Update the format of the am_compact event log message." 2019-04-03 16:03:45 +00:00
Makoto Onuki
2276ceacb3 Improve CursorWindow failure message
Bug: 129139241
Bug: 129721058
Test: atest CursorWindowTest
Change-Id: Iac1c5ec6f999dadd638fc5ab47c69d13f60ea467
2019-04-03 16:01:33 +00:00
Govinda Wasserman
1c72113451 Merge "Adds the ability for SysUI to request QSB alpha changes." 2019-04-03 15:59:10 +00:00
Andrew Solovay
ce10ef80fc docs: Javadoc cleanup
There were a number of Javadoc style problems in the
WifiNetworkSuggestion.Builder.build() docs, which caused some formatting
problems.

One specific problem worth noting: A {{ causes trouble at publish time,
because it looks like the start of a Django directive. But escaping the
{ -- e.g. &#123 -- doesn't work, because the Javadoc compiler helpfully
escapes the *ampersand*, so the HTML output is "&#123", which
renders on the page as "&#123" instead of "{". So putting a space
between the two braces seems like the simplest solution.

No code changes here, just Javadoc comment fixes.

Tested by building the docs and staging to:

http://go/dac-stage/reference/android/net/wifi/WifiNetworkSuggestion.Builder#build

Screenshots (in case the stage gets overwritten):
https://screenshot.googleplex.com/o4p7efFGCbJ.png (1)
https://screenshot.googleplex.com/nkhEqU54LNb.png (2)

Bug: 128536865
Test: make ds-docs (then build & stage)
Change-Id: Ie04bc4dc517443a6899aba989beeb38b9299826e
2019-04-03 15:54:27 +00:00
TreeHugger Robot
18cfa9abac Merge "Remove user switcher when multiple users is disabled" 2019-04-03 15:53:32 +00:00
TreeHugger Robot
2cf9ee7f9b Merge "Don't announce changes in zen dialog" 2019-04-03 15:41:33 +00:00
David Brazdil
33ed677361 Merge "Pass app's data dir to ART"
am: 16749ac83e

Change-Id: I170cbff78d12ccc418cb440820a584f141f28433
2019-04-03 08:35:34 -07:00
TreeHugger Robot
77a059fe34 Merge "Tidy up some Javadoc." 2019-04-03 15:32:42 +00:00
TreeHugger Robot
c27b0785d2 Merge "Set active stream when progerss changed by user" 2019-04-03 15:28:12 +00:00
Eric Laurent
efa6c8a8db Merge "Revert "Mute haptic channels by default."" 2019-04-03 15:23:16 +00:00
Chandan Nath
88e193ba11 Merge "[Multi-user] Clean up user state stored in the system user directory when user is removed." 2019-04-03 15:22:11 +00:00
David Brazdil
16749ac83e Merge "Pass app's data dir to ART" 2019-04-03 15:21:45 +00:00
TreeHugger Robot
ff0e1f5241 Merge "Use a confirmedTap listener to guarantee a click. This eliminates the overlapping component listener bug from the caption service." 2019-04-03 15:13:32 +00:00
Mady Mellor
ac9c597d00 Merge "Use FLAG_BUBBLE rather than setting the value ourselves" 2019-04-03 14:56:42 +00:00
Todd Kennedy
8aaa528536 Merge "OMS: ignore instant apps" 2019-04-03 14:47:01 +00:00
TreeHugger Robot
eaf603ddec Merge "Change theme setting to JSONObject format." 2019-04-03 14:40:58 +00:00
Narayan Kamath
aa22f417e3 Merge "CastTile: Better handling of multiple active devices." 2019-04-03 14:10:22 +00:00
TreeHugger Robot
2c49d1233b Merge "Tell the app that a smart reply was used even when it has been edited." 2019-04-03 14:07:39 +00:00
Misha Wagner
3666811dc6 Merge "Add more tests to KernelCpuThreadReaderDiffTest" 2019-04-03 13:55:30 +00:00
Gustav Sennton
f29f2d4ada Tell the app that a smart reply was used even when it has been edited.
The existing API RemoteInput.Source covers two scenarios for responding
to message notifications:
1. A user uses the 'reply' button and enters a response freely.
2. A user clicks a smart reply which is used as the response.

Before this CL the platform would notify the app of scenario nr. 1 in
the case where we use tap-to-edit smart replies (replies that can be
edited before being sent). With this CL we instead log scenario nr. 2
(since a smart reply was clicked).

Bug: 123407240
Test: use a test-app to ensure that a response created using smart
replies + tap-to-edit logs the correct @Source.
Change-Id: I3dc8169a3c440af106c4f244b72ddf7c9e450203
2019-04-03 14:51:28 +01:00
Jorim Jaggi
ff23ad19df Merge "Use mPidMap instead of mProcessNames to get process with pid info" 2019-04-03 13:16:43 +00:00
Tony Mak
15b64be1f4 Support content description with app name
The logic is like:
1. If content description string with app name placeholder is available,
   and we also have a app name, then we will use this string.
2. Otherwise, fallback to content description string without app
   name placeholder.

Test: atest frameworks/base/core/tests/coretests/src/android/view/textclassifier/
Test: Actually see the content description with app name is formatted
      properly

BUG: 128541828

Change-Id: Iee1dc8d4a429d759d9ab3f4b84dc1ad13b698cdb
2019-04-03 14:06:47 +01:00
Amin Shaikh
bb58879ddb Change theme setting to JSONObject format.
Add JSON_OBJECT_VALIDATOR to Settings and add unit tests.

Fixes: 129543539
Test: atest coretests
Change-Id: I4fa7a1357d442c1fa04a7eee815d5c3a48cc5115
2019-04-03 09:05:17 -04:00
Pavel Grafov
a8da697428 Don't lock the profile after setting work challenge.
In TrustManager user state defaults to "locked", so previously
the profile would become locked after work challenge is enabled.

Test: manual
Bug: 121256032
Change-Id: Ic0f5b075b85ca66c28d51830b47ed015c10da45c
2019-04-03 13:58:58 +01:00
Ecco Park
331411f945 Merge "carrier-config: define imsi_eap_identity_sequence_int key" 2019-04-03 12:56:05 +00:00
Michael Wright
c7995239ef Expose input region monitoring to system components.
This is to allow SysUI to detect system-wide gestures.

Test: manual
Bug: 123748692
Change-Id: Ic1e2cd6afea219d0e20b29e7150c9a42b75c7a67
2019-04-03 13:46:30 +01:00
Chandan Nath
7053e28b59 [Multi-user] Clean up user state stored in the system user directory
when user is removed.

For non system users, backup state is stored in both the user's own dir and the system dir.
When the user is removed, the user's own dir gets removed by the OS. This code change ensures
that the part of the user backup state which is in the system dir also gets removed.

Bug: 127650374

Test: atest -v CtsBackupHostTestCases:android.cts.backup.MultiUserBackupStateTest

Change-Id: I4ea252e8e6da608e36ec3ac335666923d88a8748
2019-04-03 13:36:55 +01:00
David Brazdil
06f2e1294b Pass app's data dir to ART
Inform ART about the location of the app's data directory when setting
up the process. This is part of an optimization that has ART cache
verification data into that directory.

Test: compiles, boots
Bug: 72131483
Change-Id: Ic80526b6ee383733eb5860e66f6c608109d838fb
2019-04-03 13:22:27 +01:00
Narayan Kamath
32492eebf9 CastTile: Better handling of multiple active devices.
With the new MediaProjection based flow for cast, we will have
a connected MediaRoute active at the same time as a MediaProjection
session. In order to deal with them correctly, we need to assume
in a few places that we have more than one active CastDevice. We
also consider all devices that are connected, regardless of whether
the given route is selected or not.

Test: Manual
Test: atest CastControllerImplTest
Test: atest SystemUITests
Bug: 128515798
Change-Id: Ie46798633f69c347ee32e0799d6cb23576122dd9
2019-04-03 12:59:11 +01:00
Mathew Inwood
1c53bca656 Merge "Greylist IActivityTaskManagerSingleton." 2019-04-03 11:52:23 +00:00
lucaslin
607a13d9d1 Merge "Fix NetworkMonitor won't do private dns resolution" am: c895b818e0 am: aecea736d2
am: 7d0a216e79

Change-Id: I2785e0aedd229aba6c1d8e8df09ee5c7a209b74c
2019-04-03 04:35:21 -07:00
lucaslin
7d0a216e79 Merge "Fix NetworkMonitor won't do private dns resolution" am: c895b818e0
am: aecea736d2

Change-Id: I5ec0cb096f2704e21e0c0f296d5cf81ab8808627
2019-04-03 04:25:18 -07:00
lucaslin
aecea736d2 Merge "Fix NetworkMonitor won't do private dns resolution"
am: c895b818e0

Change-Id: I7c7a573bef77ba952219e6f6f56ab11f0211e0a7
2019-04-03 04:13:48 -07:00
Mark Chien
ed194a33e0 Merge "Some cleanups for Tethering" am: 31b33b6f41 am: 5dff3c98c5
am: 9d4a2a27e6

Change-Id: I0f5c8f33f13dfa2366992a2b2e0ada7667b90e2f
2019-04-03 03:54:42 -07:00
Treehugger Robot
c895b818e0 Merge "Fix NetworkMonitor won't do private dns resolution" 2019-04-03 10:50:09 +00:00
Misha Wagner
5fb988fa5d Add more tests to KernelCpuThreadReaderDiffTest
Change-Id: I2fd69de9fded626d1210443bb63c4be251dd2658
Test: atest KernelCpuThreadReaderDiffTest
2019-04-03 11:45:33 +01:00
Mark Chien
9d4a2a27e6 Merge "Some cleanups for Tethering" am: 31b33b6f41
am: 5dff3c98c5

Change-Id: I0e00187f9a5eee9e55f961ce0458c9b91af19fb7
2019-04-03 03:45:05 -07:00
Mark Chien
5dff3c98c5 Merge "Some cleanups for Tethering"
am: 31b33b6f41

Change-Id: Ifb60c76855a2bea5a1cccf26034e6c582ad16021
2019-04-03 03:35:42 -07:00