Jeff Sharkey
f0d0071c24
Merge "Revert "Ensure necessary external storage dirs while creating sandboxes.""
2019-02-14 15:42:23 +00:00
TreeHugger Robot
21616c5d0c
Merge "Update systemui qs icons to gm2."
2019-02-14 15:41:58 +00:00
Jeff Sharkey
03ff08ed4c
Revert "Ensure necessary external storage dirs while creating sandboxes."
...
This reverts commit d8b4f10b56 .
Reason for revert: b/124345887
Change-Id: I0fb2a37280887e51ea3315790afc3edc1d6e7593
2019-02-14 15:41:22 +00:00
Felipe Leme
0552f41c4e
Merge "Add new ContentCapture APIs to let apps change the ContentCaptureContext."
2019-02-14 15:26:27 +00:00
Richard Uhler
2b00ad1efc
Merge "Don't special case for non-apex staged sessions."
2019-02-14 14:24:21 +00:00
Shafik Nassar
a07b43aec5
Merge "Make Rollback lifetime duration configurable"
2019-02-14 14:19:23 +00:00
Paul Duffin
78e3b2daf6
Merge "Add :frameworks-base-api-current.txt filegroup" am: 5de80df81e am: ceac819b8f
...
am: 42b7db201b
Change-Id: I61f1e9ce5dddb710059cb8feba16376d9bb99cbe
2019-02-14 05:03:58 -08:00
Paul Duffin
42b7db201b
Merge "Add :frameworks-base-api-current.txt filegroup" am: 5de80df81e
...
am: ceac819b8f
Change-Id: I2bf011e4d2a26cb2094234666c4bd24b1f65e39b
2019-02-14 04:51:23 -08:00
Paul Duffin
ceac819b8f
Merge "Add :frameworks-base-api-current.txt filegroup"
...
am: 5de80df81e
Change-Id: Ib9d5223dd891ae7471030bbc41e59f969c5de0a3
2019-02-14 04:42:22 -08:00
Treehugger Robot
5de80df81e
Merge "Add :frameworks-base-api-current.txt filegroup"
2019-02-14 12:24:32 +00:00
Olivier Gaillard
b52bf9dc30
Merge "Tracks unknown condition states."
2019-02-14 11:57:31 +00:00
TreeHugger Robot
06363e342c
Merge "New API: Settings.ACTION_REQUEST_ENABLE_CONTENT_CAPTURE"
2019-02-14 11:06:25 +00:00
Sudheer Shanka
b651c3850e
Merge "Ensure necessary external storage dirs while creating sandboxes."
2019-02-14 10:24:51 +00:00
Tiger Huang
3d11ee4837
Merge "Fix rotation if the shape of display is close to square"
2019-02-14 09:55:31 +00:00
Olivier Gaillard
bbf03b8834
Merge "Metric id should be serialized as int64 (part 2)"
2019-02-14 09:34:47 +00:00
TreeHugger Robot
214f5460b1
Merge "Moved some stable WmTest post-submit test to pre-submit"
2019-02-14 08:34:34 +00:00
Chiachang Wang
88c105868e
Merge "Use ServiceState to get data cell ID" am: a75c52c3df am: cedf4835ba
...
am: a219e306be
Change-Id: Ib1be74e18608e49276818f359c1f70ef68bfeea4
2019-02-13 23:56:34 -08:00
Chiachang Wang
a219e306be
Merge "Use ServiceState to get data cell ID" am: a75c52c3df
...
am: cedf4835ba
Change-Id: I5b66d8ab94ab0bb70ae153b9f0b1f2b28c66b08a
2019-02-13 23:47:16 -08:00
Chiachang Wang
cedf4835ba
Merge "Use ServiceState to get data cell ID"
...
am: a75c52c3df
Change-Id: Icc0b977c607c47bd28f07e6fb67d02a3de3bedde
2019-02-13 23:37:44 -08:00
Chiachang Wang
a75c52c3df
Merge "Use ServiceState to get data cell ID"
2019-02-14 07:24:16 +00:00
Hyundo Moon
3f6d07c571
Merge "MediaSession/Controller: Add playback speed related APIs"
2019-02-14 07:15:08 +00:00
TreeHugger Robot
6ec9efb5e0
Merge "TrainInfo persist onto disk"
2019-02-14 06:33:01 +00:00
Tiger Huang
3d2b89840f
Fix rotation if the shape of display is close to square
...
For a close-to-square device, the user won't get reasonable benefits
when the content on display is rotated. Worse, the rotation forces the
user to turn their device into an unnatural orientation.
In this CL, if the non-decor aspect ratio of a display is less than
config_closeToSquareDisplayMaxAspectRatio, and the device is configured
to force default orientation, we will ignore all the orientation
requests on the display, and keep the orientation as the user rotation.
For the activity which has a minAspectRatio, the logic will take account
into its preferred orientation while computing its bounds. So the shape
of bounds given to the app can meet its expectation.
Bug: 123507947
Test: atest AspectRatioTests DisplayRotationTests
Test: Manual test with wm size command and simulated display cutout
Change-Id: If99a89d59c805cfc0d305a66067643ce35b3f2bd
2019-02-14 14:14:04 +08:00
Colin Cross
3a3ec343d1
Merge "Don't run doc-comment-check-docs for update-api" am: db400ed187 am: 1dc6c1856a
...
am: 5c88b9a0af
Change-Id: I2223cf00a19e4cf3cb57a57d3590ec6f26d36ea6
2019-02-13 22:04:54 -08:00
Hongshik
b001419084
Merge "Add "close" socket option for immediately close socket after finish check captive portal." am: 5751278992 am: b697d85c60
...
am: 488c2a0f6c
Change-Id: I2105a8a26bc99469f45e7e3b0f8e2ba508d75752
2019-02-13 21:55:25 -08:00
TreeHugger Robot
e68e639954
Merge "WifiInfo: Fix javadocs to reflect the new behavior"
2019-02-14 05:48:33 +00:00
Remi NGUYEN VAN
d085587d7c
Merge "Fix flaky testNattSocketKeepalives" am: 16758070d0 am: def37aef89
...
am: 0ed6920494
Change-Id: Ibfdd4dddb8dad9ee26f9f1ec175ca87bc46ce761
2019-02-13 21:45:39 -08:00
Colin Cross
5c88b9a0af
Merge "Don't run doc-comment-check-docs for update-api" am: db400ed187
...
am: 1dc6c1856a
Change-Id: I67d2b858634dc406a8018207f9776bd2dbce5f70
2019-02-13 21:39:36 -08:00
Shuo Qian
1d03680645
[automerger skipped] Merge "Call e.rethrowFromSystemServer() to exception of setDefaultSmsSubId" am: 6cc4c0c029 am: feee99e594
...
am: f3d7a41dd1 -s ours
am skip reason: change_id Ica15965cb904b758e078b8439e5e9d3f39b9c0a2 with SHA1 04e94fcb0a is in history
Change-Id: If01773b3cf51fad385a02ab9e769478ca5adec4c
2019-02-13 21:38:30 -08:00
Hongshik
488c2a0f6c
Merge "Add "close" socket option for immediately close socket after finish check captive portal." am: 5751278992
...
am: b697d85c60
Change-Id: Id7f0198771a3da31b577e64da2816bc61c2e04cd
2019-02-13 21:32:48 -08:00
Android Build Merger (Role)
596f6a18a9
Merge "Merge "Add build rule of data stall proto" am: f9727b43cb am: 6964f58149 am: fe42888761"
2019-02-14 05:28:38 +00:00
Chiachang Wang
06232688f2
Merge "Add build rule of data stall proto" am: f9727b43cb am: 6964f58149
...
am: fe42888761
Change-Id: I54d059d23ef628b338a5b406ddcf73477984e6e8
2019-02-13 21:28:03 -08:00
TreeHugger Robot
e4579c9fb2
Merge "[Game Driver] Add global whitelist option."
2019-02-14 05:25:35 +00:00
Remi NGUYEN VAN
0ed6920494
Merge "Fix flaky testNattSocketKeepalives" am: 16758070d0
...
am: def37aef89
Change-Id: I20ec043e5caeb61c4e31f087a10deb2dc13c0d95
2019-02-13 21:24:35 -08:00
Hyundo Moon
04fb2e74b8
MediaSession/Controller: Add playback speed related APIs
...
Bug: 122906243
Test: Passed MediaSession/ControllerTest
Change-Id: I1a8c6b7a6340f18cff0179b7fe1bc559a1f4cb68
2019-02-14 14:20:53 +09:00
Lucas Lin
d9e0786fc1
Merge "Clear all lingering notifications when network is disconnected" am: 1037bbb82a am: deac15fa83
...
am: 238ddb629d
Change-Id: I2ef6009364bd1420c915df003e2ff5c3857ef3e7
2019-02-13 21:20:09 -08:00
Colin Cross
1dc6c1856a
Merge "Don't run doc-comment-check-docs for update-api"
...
am: db400ed187
Change-Id: I287e1dadaa4e2050865ebe26a2e481e027c8dd0a
2019-02-13 21:17:18 -08:00
Shuo Qian
f3d7a41dd1
Merge "Call e.rethrowFromSystemServer() to exception of setDefaultSmsSubId" am: 6cc4c0c029
...
am: feee99e594
Change-Id: Ib3fb3ef69b98879badb26a02570e2089aee2df12
2019-02-13 21:14:35 -08:00
Chiachang Wang
fe42888761
Merge "Add build rule of data stall proto" am: f9727b43cb
...
am: 6964f58149
Change-Id: I5151f3abf2556a53c437a7998b0a5d093e69afaf
2019-02-13 21:09:22 -08:00
Hongshik
b697d85c60
Merge "Add "close" socket option for immediately close socket after finish check captive portal."
...
am: 5751278992
Change-Id: Ifae5a6889fc20bcd7f4269205c33e3e7fa6bd8f0
2019-02-13 21:08:32 -08:00
Sehee Park
05141df15a
Merge "Enable DOM storage API for CaptivePortalLoginActivity" am: f7150486bf am: 7042e290cf
...
am: f27ea45a90
Change-Id: Ie07ab945aa6a5c997f776f237f757c533cc1d453
2019-02-13 21:08:16 -08:00
Lucas Lin
238ddb629d
Merge "Clear all lingering notifications when network is disconnected" am: 1037bbb82a
...
am: deac15fa83
Change-Id: I441a37682e11aa349301750c26545c5c0f1a274a
2019-02-13 21:04:01 -08:00
Colin Cross
db400ed187
Merge "Don't run doc-comment-check-docs for update-api"
2019-02-14 04:58:42 +00:00
Sehee Park
f27ea45a90
Merge "Enable DOM storage API for CaptivePortalLoginActivity" am: f7150486bf
...
am: 7042e290cf
Change-Id: I8f46698b23118213019226e4b9d5e6b196b010d3
2019-02-13 20:57:13 -08:00
Treehugger Robot
5751278992
Merge "Add "close" socket option for immediately close socket after finish check captive portal."
2019-02-14 04:55:21 +00:00
Remi NGUYEN VAN
def37aef89
Merge "Fix flaky testNattSocketKeepalives"
...
am: 16758070d0
Change-Id: Ie9fe40e3bcf4187a2e5cbf525bc4e874cff70747
2019-02-13 20:42:01 -08:00
Shuo Qian
feee99e594
Merge "Call e.rethrowFromSystemServer() to exception of setDefaultSmsSubId"
...
am: 6cc4c0c029
Change-Id: I17375b97d6c695f810ea23d6682bb598c5a55b35
2019-02-13 20:38:03 -08:00
Chiachang Wang
6964f58149
Merge "Add build rule of data stall proto"
...
am: f9727b43cb
Change-Id: I0ec765ab554fb83bcaad5abb8131bb56d39401b7
2019-02-13 20:33:46 -08:00
Lucas Lin
deac15fa83
Merge "Clear all lingering notifications when network is disconnected"
...
am: 1037bbb82a
Change-Id: I2d9f84840cdc73ed3b30278d7a9dbeefff233fa3
2019-02-13 20:29:03 -08:00
Sehee Park
7042e290cf
Merge "Enable DOM storage API for CaptivePortalLoginActivity"
...
am: f7150486bf
Change-Id: Ie6e99f0c8ddeb28086197b291c198fa115f6e157
2019-02-13 20:21:56 -08:00