Sasha Smundak
2f2e353f79
Merge "Convert Android.mk file to Android.bp" am: a81d64e940 am: efa1d26538
...
am: 8e0d9d8473
Change-Id: Ic6d75ff8e072f9f3eb6ca472bea0122ac220075a
2019-02-19 10:57:08 -08:00
Sasha Smundak
8e0d9d8473
Merge "Convert Android.mk file to Android.bp" am: a81d64e940
...
am: efa1d26538
Change-Id: I8e82717e35d5d569a2a91fb609726537733d1aba
2019-02-19 10:46:30 -08:00
Mark Renouf
49df009529
Merge "Forward StatusBar.onBackPressed to Bubbles when expanded"
2019-02-19 18:33:38 +00:00
Sasha Smundak
efa1d26538
Merge "Convert Android.mk file to Android.bp"
...
am: a81d64e940
Change-Id: I8202195e94c616d8b09e76aa01f4d74f098afd3e
2019-02-19 10:32:16 -08:00
Beverly
b3d17d69a4
[automerger skipped] Merge "Update keyguard charging text to indicate wireless" into pi-dev am: 06cfb175bd
...
am: 0a928f8903 -s ours
am skip reason: change_id I9cce8ecaf07f8870164d9ef8a569fcf30db69d85 with SHA1 7d7f699f4a is in history
Change-Id: I70aba4c5c7412548c2e94bcb4f6f3b5a8d59a696
2019-02-19 10:24:45 -08:00
Treehugger Robot
a81d64e940
Merge "Convert Android.mk file to Android.bp"
2019-02-19 18:18:40 +00:00
Beverly
0a928f8903
Merge "Update keyguard charging text to indicate wireless" into pi-dev
...
am: 06cfb175bd
Change-Id: Ia474165d912c2090f4756108124c8a0333b31e6b
2019-02-19 10:16:32 -08:00
Christian Wailes
18f7673fcd
Merge "Add blastula pool system properties"
2019-02-19 18:15:48 +00:00
Ryan Mitchell
975c6e2d26
Merge "Fix seg faul when parsing invalid <plurals>"
2019-02-19 18:09:56 +00:00
TreeHugger Robot
06cfb175bd
Merge "Update keyguard charging text to indicate wireless" into pi-dev
2019-02-19 18:02:30 +00:00
Lucas Dupin
311af9ea4b
Merge "Improve the performance when loading image wallpaper colors"
2019-02-19 16:57:38 +00:00
Richard Uhler
a331a7bd16
Merge "Add StagedRollbackTest to TEST_MAPPING."
2019-02-19 16:36:55 +00:00
Dario Freni
c863db8227
Merge "Add dariofreni to APEX-related files owners." am: 9d805ba071 am: c423836b08
...
am: 20b87e639c
Change-Id: Idf0a66d4836bbcced09571757a611111f37dace7
2019-02-19 08:19:45 -08:00
Dario Freni
20b87e639c
Merge "Add dariofreni to APEX-related files owners." am: 9d805ba071
...
am: c423836b08
Change-Id: I758e913f07aba1462375a7239ca6daadb81c3657
2019-02-19 08:09:44 -08:00
Jeff Sharkey
aa7b682699
Merge "MediaStore API and docs polishing."
2019-02-19 15:58:57 +00:00
Dario Freni
c423836b08
Merge "Add dariofreni to APEX-related files owners."
...
am: 9d805ba071
Change-Id: I13e6dda30f6aeaab8654758cd55a0166b019507c
2019-02-19 07:54:42 -08:00
Dario Freni
86c329ac8c
Merge "IllegalStateException if apex is unavailable."
2019-02-19 15:47:55 +00:00
Dario Freni
c603effca5
Merge "Remove unused APEX session state."
2019-02-19 15:46:51 +00:00
Dario Freni
9d805ba071
Merge "Add dariofreni to APEX-related files owners."
2019-02-19 15:43:35 +00:00
Dario Freni
95e9094aca
Merge "Fix typo in javadoc."
2019-02-19 15:33:24 +00:00
Pavel Grafov
047bf28243
Merge "Dummy change to test postsubmit invocation"
2019-02-19 15:24:07 +00:00
Nicolas Geoffray
8b9abc98b5
Merge "Add a dalvik.vm.boot-image option for zygote and installd." am: 80e697a297 am: f2bcd619a1
...
am: bda2cb3b18
Change-Id: Ia60c8b93f1dec2285d2d539377e49b8bf79f7734
2019-02-19 07:03:10 -08:00
Nicolas Geoffray
bda2cb3b18
Merge "Add a dalvik.vm.boot-image option for zygote and installd." am: 80e697a297
...
am: f2bcd619a1
Change-Id: If5c1bbd614f5c3758f636f6a30ac93e0b64bb01d
2019-02-19 06:53:30 -08:00
Nicolas Geoffray
f2bcd619a1
Merge "Add a dalvik.vm.boot-image option for zygote and installd."
...
am: 80e697a297
Change-Id: Icbdf60640f0a1b5995ad09eba0bee6ed81b50c4a
2019-02-19 06:44:44 -08:00
Gavin Corkery
f3f3d1ca94
Merge "Rename data/staging to data/pkg_staging"
2019-02-19 14:40:59 +00:00
Nicolas Geoffray
80e697a297
Merge "Add a dalvik.vm.boot-image option for zygote and installd."
2019-02-19 14:28:18 +00:00
Pavel Grafov
846ad2ded2
Dummy change to test postsubmit invocation
...
Bug: 124653467
Test: builds
Change-Id: I3cdf2a2647c8e0e4dd2e4bc49cd5cd5ff1daed4e
2019-02-19 11:26:46 +00:00
Dario Freni
38309712bc
Remove unused APEX session state.
...
This state is unused and will be completely removed in a follow-up CL.
Bug: 124367761
Test: n/a
Change-Id: Ie4e0954aae0c72ae0887fc15a3cafb02e5c7099f
2019-02-19 10:52:35 +00:00
Dario Freni
a1c5f63126
IllegalStateException if apex is unavailable.
...
apexservice is expected to be active before zygote is run. In the
exceptional case it isn't we should fail fast and throw a clear error
message. The current version of the code would just assign "null" to the
mApexService variable, thus causing a null pointer exception later in
the code.
Bug: 124363450
Test: device boots.
Change-Id: I07361163c6e9efd392a633b30e85ca6be9f58ab3
2019-02-19 10:43:33 +00:00
Philip P. Moltmann
753f4ce468
Merge "Support revoke-when-requested with pre-M apps"
2019-02-19 10:34:09 +00:00
Dario Freni
3d3997abb4
Add dariofreni to APEX-related files owners.
...
Test: n/a
Change-Id: I3a26033f52d98e5edcde852fff007ba33ae90856
2019-02-19 10:21:22 +00:00
Adam Vartanian
3deb23fead
Merge "Fix authority parsing test" am: 8ce3609e58 am: becdd58df5
...
am: 598b2497b3
Change-Id: Ic32fceebd7936b779efed954dcd0745b1207f7ff
2019-02-19 02:04:16 -08:00
Richard Uhler
f500684d90
Add StagedRollbackTest to TEST_MAPPING.
...
Bug: 124043688
Test: frameworks/base/tests/RollbackTest$ atest
Change-Id: Ifbfb725a5909fe80aae6af4d90f9d0d3804839c5
2019-02-19 09:59:06 +00:00
Adam Vartanian
598b2497b3
Merge "Fix authority parsing test" am: 8ce3609e58
...
am: becdd58df5
Change-Id: I41d4997661cf011e9589aedac9de301b1becb441
2019-02-19 01:54:53 -08:00
Adam Vartanian
becdd58df5
Merge "Fix authority parsing test"
...
am: 8ce3609e58
Change-Id: I8554fddceb326c52b85b34a483b3e3791abf2cdc
2019-02-19 01:44:45 -08:00
Adam Vartanian
8ce3609e58
Merge "Fix authority parsing test"
2019-02-19 09:27:35 +00:00
Adam Vartanian
f240cb8091
Fix authority parsing test
...
The test has been failing because http://r.android.com/793302 changed
how the port separator was found, only scanning ASCII digits until it
hits a colon, and previously it would scan for the colon and then
percent-decode the rest of it. The new behavior actually better
matches the WHATWG URL parsing algorithm [1], which specifies that
ports only include ASCII digits. It does mean that some edge cases
that previously parsed as host "foo", port 42 will now parse as
host "foo:42", no port, but those URLs wouldn't be accepted by
browsers so they should be exceedingly rare.
The behavior per the WHATWG spec would be to fail to parse in the case
of a percent-encoded character in the port section, but this class is
specifically documented to accept garbage, so lumping the mis-encoded
port as part of the hostname (which will result in a hostname that's
invalid and impossible to resolve) seems like the best option.
[1] https://url.spec.whatwg.org/#port-state
Fixes: 124360078
Test: atest android.net.UriTest
Change-Id: I1c788cb7703c821ae74b542b74d89e10cba5a546
2019-02-19 09:27:24 +00:00
Alan Stokes
218c9e7d9b
Merge "Attempt to de-flake tests."
2019-02-19 09:08:55 +00:00
Richard Uhler
d943d26c55
Merge "RollbackManager: fix installedUsers null pointer exception."
2019-02-19 08:55:52 +00:00
Tiger Huang
03c20bbf6e
Merge "Remove InputForwarder"
2019-02-19 07:18:41 +00:00
Philip P. Moltmann
d030ce24c1
Support revoke-when-requested with pre-M apps
...
In this case the permission should not be revoked, but the app-op should
be.
Fixes: 124609307
Test: atest SplitPermissionTests
Change-Id: I4e70b8f9ef1e01320adb55096437e82a058883db
2019-02-18 21:09:13 -08:00
TreeHugger Robot
1ca52f005a
Merge "Remove opposite position of nav bar for short aspect ratio app"
2019-02-19 04:29:37 +00:00
Jeff Chang
bee3883606
Merge "Suppress the warning toast if the preferredDisplay was set to singleTask"
2019-02-19 04:08:26 +00:00
TreeHugger Robot
d8b240cbb0
Merge "Add TEST_MAPPING for GtsUnofficialApisUsageTestCases"
2019-02-19 03:35:39 +00:00
Raj Mamadgi
50ca62a11b
Merge "Fix for testLifecycleOnMoveToFromSplitScreenRelaunch" am: 43d11758fa am: 0f174795e4
...
am: 03549b860a
Change-Id: I4d6037597d60b5990db0b95bdee3cb69c500ec49
2019-02-18 18:36:10 -08:00
Raj Mamadgi
03549b860a
Merge "Fix for testLifecycleOnMoveToFromSplitScreenRelaunch" am: 43d11758fa
...
am: 0f174795e4
Change-Id: Ie32376993dcc8b06f3d2254d6aecdb9a4f843236
2019-02-18 18:22:41 -08:00
Raj Mamadgi
0f174795e4
Merge "Fix for testLifecycleOnMoveToFromSplitScreenRelaunch"
...
am: 43d11758fa
Change-Id: I6b248297523070983c63b5dd870e235eea5ee59c
2019-02-18 18:13:45 -08:00
wilsonshih
0e490d9e77
Improve the performance when loading image wallpaper colors
...
When SystemUI start up, ColorExtractor will get wallpaper colors so
status bar can use it to update theme, however, this will also block
SystemUI start up process if the wallpaper is image wallpaper.
In order to break the latency, we can extract getWallpaperColors
method from ColorExtractor's contructor, and do it at another thread,
so it won't block SystemUI start up.
Bug: 124279857
Test: atest ColorExtractorTest
Test: Manual test change theme feature can work normally.
Change-Id: I8589b28a17b0a2b33b4bbbda2265080af983f26a
2019-02-19 10:06:22 +08:00
Treehugger Robot
43d11758fa
Merge "Fix for testLifecycleOnMoveToFromSplitScreenRelaunch"
2019-02-19 02:02:35 +00:00
Yunfan Chen
1cdbfae1fb
Merge "Move WindowStateTests into flaky one"
2019-02-19 02:02:17 +00:00