Seigo Nonaka
b8293dee84
Merge "Make PrecomputedText Spannable for supporting selection" into pi-dev
...
am: 71ed54f377
2018-03-16 16:10:55 +00:00
TreeHugger Robot
71ed54f377
Merge "Make PrecomputedText Spannable for supporting selection" into pi-dev
2018-03-16 15:43:46 +00:00
Jorim Jaggi
a8f9417977
Merge "Fix stuck exiting windows" into pi-dev
...
am: 65e2dda7f8
2018-03-16 15:02:47 +00:00
Adrian Roos
3802114751
Merge "DisplayCutout: Fix corner cutout issues in SystemUI" into pi-dev
...
am: be6007f0e0
2018-03-16 14:49:36 +00:00
Adam Newman
1ecbb6a7c6
Merge "Enable optional divider in AccessPointPreference" into pi-dev
...
am: 6ecff890e3
2018-03-16 14:41:42 +00:00
Jorim Jaggi
65e2dda7f8
Merge "Fix stuck exiting windows" into pi-dev
2018-03-16 14:35:01 +00:00
Adrian Roos
be6007f0e0
Merge "DisplayCutout: Fix corner cutout issues in SystemUI" into pi-dev
2018-03-16 14:27:30 +00:00
Adam Newman
6ecff890e3
Merge "Enable optional divider in AccessPointPreference" into pi-dev
2018-03-16 14:26:25 +00:00
Alan Viverette
5ea38d0493
Merge "Restore "Update packages for 1.0.0-beta1"" into pi-dev
...
am: 259dd151f4
2018-03-16 14:06:04 +00:00
Alan Viverette
259dd151f4
Merge "Restore "Update packages for 1.0.0-beta1"" into pi-dev
2018-03-16 13:53:46 +00:00
Adrian Roos
2b3389feaf
Merge "DisplayCutout: Add corner cutout overlay" into pi-dev
...
am: e90248c00e
2018-03-16 13:12:20 +00:00
Adrian Roos
e90248c00e
Merge "DisplayCutout: Add corner cutout overlay" into pi-dev
2018-03-16 13:01:00 +00:00
David Brazdil
5c95c5afa3
Merge "Add uses of hidden APIs from vendor apps" into pi-dev
...
am: 54503fbeed
2018-03-16 12:55:35 +00:00
TreeHugger Robot
54503fbeed
Merge "Add uses of hidden APIs from vendor apps" into pi-dev
2018-03-16 12:45:47 +00:00
Jorim Jaggi
d99e34f558
Merge "Boost thread priorities when running recents anim" into pi-dev
...
am: 93c2359507
2018-03-16 12:29:56 +00:00
Jorim Jaggi
93c2359507
Merge "Boost thread priorities when running recents anim" into pi-dev
2018-03-16 12:14:48 +00:00
Annie Meng
dc671e166d
Merge "DO NOT MERGE Create a setting for backup/restore agent timeouts" into pi-dev
...
am: ec243338ea
2018-03-16 10:37:19 +00:00
Annie Meng
ec243338ea
Merge "DO NOT MERGE Create a setting for backup/restore agent timeouts" into pi-dev
2018-03-16 10:25:32 +00:00
David Brazdil
873d1d30d5
Add uses of hidden APIs from vendor apps
...
These will move into the dark greylist once we remove the UI toast.
Merge them with light greylist for now.
Bug: 64382372
Bug: 74589747
Bug: 74588266
Bug: 74586173
Bug: 74586969
Test: make
Change-Id: I8c1d3b67b763e8b14a66874705ba7165cf421e72
Merged-In: I5d0ec308a0187d67df6d9a4f0778c9285dc1e2af
2018-03-16 10:23:09 +00:00
Hyundo Moon
5563e8f5de
MediaSession2: Implement getPlayerState/Position/BufferedPosition
...
am: 78e4f84f04
2018-03-16 09:47:42 +00:00
Hyundo Moon
78e4f84f04
MediaSession2: Implement getPlayerState/Position/BufferedPosition
...
Bug: 74578458
Test: Passed CTS
Change-Id: If215e8e16bdce9fdc04ca18ed8d08ed374d13a98
2018-03-16 18:03:17 +09:00
Jaewan Kim
05ccd347d1
Merge "MediaSession2: Implement PlaylistParams replacements" into pi-dev
...
am: 328df91d99
2018-03-16 06:50:42 +00:00
Jaewan Kim
328df91d99
Merge "MediaSession2: Implement PlaylistParams replacements" into pi-dev
2018-03-16 06:35:23 +00:00
Andreas Gampe
fd2853cc66
Merge "Frameworks: Fix system server profiling" into pi-dev
...
am: a2d0f2f335
2018-03-16 05:03:09 +00:00
Yohei Yukawa
0939856ff4
Merge "Delay DropBox until SettingsProvider becomes ready" into pi-dev
...
am: 5e61df7a8e
2018-03-16 04:54:12 +00:00
Ryo Hashimoto
583d8962a4
Merge "Change FUSE_MAX_WRITE's value to 128KB" into pi-dev
...
am: ebc30594e0
2018-03-16 04:42:55 +00:00
Ryo Hashimoto
6fde033eae
Merge "Fix buffer size check in replyRead" into pi-dev
...
am: cf7b8a1406
2018-03-16 04:17:04 +00:00
Rob Carr
b12f236e41
Merge "Ensure Surface is recreated if children are detached." into pi-dev
...
am: 7311bbd70b
2018-03-16 04:10:59 +00:00
TreeHugger Robot
a2d0f2f335
Merge "Frameworks: Fix system server profiling" into pi-dev
2018-03-16 04:00:48 +00:00
Jaewan Kim
d28a13b41e
Merge "MediaSession2: Remove MediaSession2#registerPlayerEventCallback()" into pi-dev
...
am: eb8e914ea7
2018-03-16 03:46:17 +00:00
Jaewan Kim
94454404a5
Merge "MediaSession2: Remove onPlaylistChanged() without metadata" into pi-dev
...
am: 9cc144850f
2018-03-16 03:38:03 +00:00
TreeHugger Robot
5e61df7a8e
Merge "Delay DropBox until SettingsProvider becomes ready" into pi-dev
2018-03-16 03:36:00 +00:00
Makoto Onuki
32cbf6e0e7
Merge "Add phenotype flag to disable battery saver tron log" into pi-dev
...
am: fc1784233b
2018-03-16 03:31:11 +00:00
Robert Carr
0f5ec72d4b
Merge "Fix resetting of wallpaper offset." into pi-dev
...
am: 012c971e4c
2018-03-16 03:27:56 +00:00
Peiyong Lin
e3157de750
Merge "Replace android_color_mode usage with ColorMode." into pi-dev
...
am: 0cb97d5501
2018-03-16 03:22:53 +00:00
Jaewan Kim
f10ca2f960
MediaSession2: Implement PlaylistParams replacements
...
This includes following changes
- Remove PlaylistParams
- Implement PlaylistParams replacements. Here's the list.
- get/setShuffleMode()
- get/setRepeatMode()
- Note: Playlist metadata APIs are already submitted (b/74174649)
Bug: 74116823, Bug: 74118768
Test: Run CTS with MediaComponents/runcts.sh
Change-Id: I0267ffeaf92257eb7b81ffc8b6a3f40b5a2f6f9c
2018-03-16 12:21:29 +09:00
Doris Ling
7a54a42357
Merge "Use the correct prebuilts for lifecycles." into pi-dev
...
am: 9fd538dac6
2018-03-16 03:19:51 +00:00
Jerry Zhang
ceb386a8b3
Merge "Update USB charging strings" into pi-dev
...
am: f836c8940a
2018-03-16 03:15:07 +00:00
Robert Carr
6ac3e7ce1b
Merge "Bump activity stop timeout past ANR timeout." into pi-dev
...
am: 82c4ae150c
2018-03-16 03:11:49 +00:00
TreeHugger Robot
ebc30594e0
Merge "Change FUSE_MAX_WRITE's value to 128KB" into pi-dev
2018-03-16 03:00:44 +00:00
TreeHugger Robot
cf7b8a1406
Merge "Fix buffer size check in replyRead" into pi-dev
2018-03-16 02:57:51 +00:00
Robert Carr
7148bdf94a
Merge "Update JNI to call captureChildLayers" into pi-dev
...
am: ed875ea132
2018-03-16 02:55:42 +00:00
Kevin Neas
c5a792ae68
Merge "Protecting against trying to launch apps that don't exist" into pi-dev
...
am: 9b8b54f9f6
2018-03-16 02:48:43 +00:00
Adam Newman
218ab6b252
Enable optional divider in AccessPointPreference
...
Create a new preference layout based on layout_preference_two_target
that will allow for the optional use of a second target with a ripple
animation that stops at the hairline divider as well as a toggle for the
hairline divider.
This will enable ConnectedAccessPointPreference to
display a split between the left and right half when a Captive Portal
signin is pending.
Bug: 63929546
Bug: 68031656
Test: make RunSettingsLibRoboTests
Test: manual testing with Captive Portal and normal WiFi networks.
Change-Id: I5c8c513290ed04a8dcc38c3f9d6c149c9cca08aa
(cherry picked from commit c0a8276d9f
2018-03-16 02:45:15 +00:00
Android Build Merger (Role)
062f2c39f9
Merge "Merge "Remove unnecessary static libraries in libmedia2_jni" into pi-dev am: a2ab56a425" into pi-dev-plus-aosp
2018-03-16 02:41:55 +00:00
Dongwon Kang
34df582e76
Merge "Remove unnecessary static libraries in libmedia2_jni" into pi-dev
...
am: a2ab56a425
2018-03-16 02:41:29 +00:00
Rob Carr
7311bbd70b
Merge "Ensure Surface is recreated if children are detached." into pi-dev
2018-03-16 02:41:13 +00:00
Chen Xu
7deedb67a5
Merge "reword title of CS rejection notification" am: 790e4f475f
...
am: c443d8645f
2018-03-16 02:39:32 +00:00
Jaewan Kim
eb8e914ea7
Merge "MediaSession2: Remove MediaSession2#registerPlayerEventCallback()" into pi-dev
2018-03-16 02:32:44 +00:00
Jaewan Kim
9cc144850f
Merge "MediaSession2: Remove onPlaylistChanged() without metadata" into pi-dev
2018-03-16 02:31:36 +00:00
