Jaewan Kim
|
c9871326dd
|
Merge "MediaSession2: Implement PlaylistParams replacements" into pi-dev am: 328df91d99
am: 05ccd347d1
Change-Id: I547d96c04a7b4264dbb29ccf55bac44b74138acd
|
2018-03-16 07:05:14 +00:00 |
|
Jaewan Kim
|
05ccd347d1
|
Merge "MediaSession2: Implement PlaylistParams replacements" into pi-dev
am: 328df91d99
Change-Id: Ia718e5c82ac4a055bb3314d716cc910648c75fff
|
2018-03-16 06:50:42 +00:00 |
|
Andreas Gampe
|
0ed6c2ae10
|
Merge "Frameworks: Fix system server profiling" into pi-dev am: a2d0f2f335 -s ours
am: fd2853cc66 -s ours
Change-Id: I9e06eba6bc761353e6d9ad928951634492aeb828
|
2018-03-16 06:35:49 +00:00 |
|
Jaewan Kim
|
328df91d99
|
Merge "MediaSession2: Implement PlaylistParams replacements" into pi-dev
|
2018-03-16 06:35:23 +00:00 |
|
Yohei Yukawa
|
52f250e0fa
|
Merge "Delay DropBox until SettingsProvider becomes ready" into pi-dev am: 5e61df7a8e
am: 0939856ff4
Change-Id: I676576ba7ab3ed86a30f25187eae4be26e9c7085
|
2018-03-16 06:28:30 +00:00 |
|
Ryo Hashimoto
|
71d36aa327
|
Merge "Change FUSE_MAX_WRITE's value to 128KB" into pi-dev am: ebc30594e0
am: 583d8962a4
Change-Id: I74a85f3c8a4a5d8a427d0aa2c1d4ebabdb7997df
|
2018-03-16 06:21:01 +00:00 |
|
Ryo Hashimoto
|
4c8e177dab
|
Merge "Fix buffer size check in replyRead" into pi-dev am: cf7b8a1406
am: 6fde033eae
Change-Id: Ic49deb1544e34fd4692faa8d6f29d3b3bd8a85f0
|
2018-03-16 06:03:21 +00:00 |
|
Rob Carr
|
435113c1bc
|
Merge "Ensure Surface is recreated if children are detached." into pi-dev am: 7311bbd70b
am: b12f236e41
Change-Id: I9540936a79eaa616dbc7d7d2cf259846d7b8cd28
|
2018-03-16 05:49:48 +00:00 |
|
Andreas Gampe
|
fd2853cc66
|
Merge "Frameworks: Fix system server profiling" into pi-dev
am: a2d0f2f335 -s ours
Change-Id: I17c36c63528d2ff04875f6a69ce86f982ebb2400
|
2018-03-16 05:03:09 +00:00 |
|
Jaewan Kim
|
2d7cfda523
|
Merge "MediaSession2: Remove MediaSession2#registerPlayerEventCallback()" into pi-dev am: eb8e914ea7
am: d28a13b41e
Change-Id: Iec8385c88d8b5951b588ba71a09123faf415e541
|
2018-03-16 05:03:07 +00:00 |
|
Yohei Yukawa
|
0939856ff4
|
Merge "Delay DropBox until SettingsProvider becomes ready" into pi-dev
am: 5e61df7a8e
Change-Id: Ic87e82cf9c02e7c42313221613ad793b56f9da7e
|
2018-03-16 04:54:12 +00:00 |
|
Jaewan Kim
|
f4abf4a0fe
|
Merge "MediaSession2: Remove onPlaylistChanged() without metadata" into pi-dev am: 9cc144850f
am: 94454404a5
Change-Id: If65047774343ba0d6a6676dac2885a7f73559a97
|
2018-03-16 04:51:33 +00:00 |
|
Makoto Onuki
|
275cdb8994
|
Merge "Add phenotype flag to disable battery saver tron log" into pi-dev am: fc1784233b
am: 32cbf6e0e7
Change-Id: Ib33192b0d2ef859ab344f12057d172036385fe41
|
2018-03-16 04:47:39 +00:00 |
|
Robert Carr
|
e66c8e0bea
|
Merge "Fix resetting of wallpaper offset." into pi-dev am: 012c971e4c
am: 0f5ec72d4b
Change-Id: Ib9b1579cabd78013c44753af2f368e2d9c2521a4
|
2018-03-16 04:44:10 +00:00 |
|
Ryo Hashimoto
|
583d8962a4
|
Merge "Change FUSE_MAX_WRITE's value to 128KB" into pi-dev
am: ebc30594e0
Change-Id: I2b7f32f7e500a8c4cacfeb84966d149b41e32ac8
|
2018-03-16 04:42:55 +00:00 |
|
Peiyong Lin
|
70c31f07ff
|
Merge "Replace android_color_mode usage with ColorMode." into pi-dev am: 0cb97d5501
am: e3157de750
Change-Id: Ifaad16427ed79f68f6fe21602c7c79cd85395f67
|
2018-03-16 04:39:39 +00:00 |
|
Doris Ling
|
4ab2e98acd
|
Merge "Use the correct prebuilts for lifecycles." into pi-dev am: 9fd538dac6
am: 7a54a42357
Change-Id: Ia2691321ee06e9f618a4a5c9b7df21a6ccfa8185
|
2018-03-16 04:36:25 +00:00 |
|
Jerry Zhang
|
86d692cb45
|
Merge "Update USB charging strings" into pi-dev am: f836c8940a
am: ceb386a8b3
Change-Id: Ice7b8ecbc0d8ae8deaefd293877270aacb720465
|
2018-03-16 04:32:49 +00:00 |
|
Robert Carr
|
4c2bf7a181
|
Merge "Bump activity stop timeout past ANR timeout." into pi-dev am: 82c4ae150c
am: 6ac3e7ce1b
Change-Id: I0656be8fa0ea0326987ca2b73a51b5b1f661b7f9
|
2018-03-16 04:29:01 +00:00 |
|
Robert Carr
|
7acc6f1dd1
|
Merge "Update JNI to call captureChildLayers" into pi-dev am: ed875ea132
am: 7148bdf94a
Change-Id: I6150f8dedef0326022dfbca493af6439f7814852
|
2018-03-16 04:25:45 +00:00 |
|
Ryo Hashimoto
|
6fde033eae
|
Merge "Fix buffer size check in replyRead" into pi-dev
am: cf7b8a1406
Change-Id: I10ad7a0798d11d15fba5e358abd38166f48af488
|
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
Change-Id: Ic7f008990ecd0bcd936391681000c50d78daaa00
|
2018-03-16 04:10:59 +00:00 |
|
Kevin Neas
|
a57b13a1b8
|
Merge "Protecting against trying to launch apps that don't exist" into pi-dev am: 9b8b54f9f6
am: c5a792ae68
Change-Id: I13042ccc50a933c86e0f80a116c650ef2c71ad0b
|
2018-03-16 04:04:36 +00:00 |
|
TreeHugger Robot
|
a2d0f2f335
|
Merge "Frameworks: Fix system server profiling" into pi-dev
|
2018-03-16 04:00:48 +00:00 |
|
Dongwon Kang
|
fa9239bb38
|
Merge "Merge "Remove unnecessary static libraries in libmedia2_jni" into pi-dev am: a2ab56a425" into pi-dev-plus-aosp
am: 062f2c39f9
Change-Id: Ibd06da4fa99c2655f5a0618888f70fb3f610ecd4
|
2018-03-16 03:57:10 +00:00 |
|
Jaewan Kim
|
d28a13b41e
|
Merge "MediaSession2: Remove MediaSession2#registerPlayerEventCallback()" into pi-dev
am: eb8e914ea7
Change-Id: I1ec5617fa7baade1dac16ba5bb55a04766055e46
|
2018-03-16 03:46:17 +00:00 |
|
Chen Xu
|
a77f884c8b
|
Merge "reword title of CS rejection notification" am: 790e4f475f am: c443d8645f -s ours
am: 7deedb67a5 -s ours
Change-Id: Ifcda6bc067d7bf2ff8c51e177c7e6cc147c2a119
|
2018-03-16 03:45:44 +00:00 |
|
Jaewan Kim
|
94454404a5
|
Merge "MediaSession2: Remove onPlaylistChanged() without metadata" into pi-dev
am: 9cc144850f
Change-Id: Ie0306ae01bac8abf7b4e7a4c3001fed21cb53fa3
|
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
Change-Id: I5abc925c966f7e2827c039c9041283d4311ac663
|
2018-03-16 03:31:11 +00:00 |
|
Robert Carr
|
0f5ec72d4b
|
Merge "Fix resetting of wallpaper offset." into pi-dev
am: 012c971e4c
Change-Id: Ic6edc048723272611cfca774f7cad58fa51410bd
|
2018-03-16 03:27:56 +00:00 |
|
Peiyong Lin
|
e3157de750
|
Merge "Replace android_color_mode usage with ColorMode." into pi-dev
am: 0cb97d5501
Change-Id: Ic9ae6281e823de6535877ab35fc9ed0fc73c188e
|
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
Change-Id: I238b8ace1b78d5134d8b504c877792371daaa883
|
2018-03-16 03:19:51 +00:00 |
|
Jerry Zhang
|
ceb386a8b3
|
Merge "Update USB charging strings" into pi-dev
am: f836c8940a
Change-Id: I47ec3758b8246f3c4471a1eedc37d0a186c3ac01
|
2018-03-16 03:15:07 +00:00 |
|
Robert Carr
|
6ac3e7ce1b
|
Merge "Bump activity stop timeout past ANR timeout." into pi-dev
am: 82c4ae150c
Change-Id: I1df6ebf343abd907da0072d885578130b2da8435
|
2018-03-16 03:11:49 +00:00 |
|
Hyundo Moon
|
9182a7964a
|
Merge "MediaSession2: Convert DataSourceDesc to MediaItem2 in MyPlayerEventCallback" into pi-dev am: b0179a3a44
am: 0cbac17c98
Change-Id: Ia32f2e68d1317bfbc5aab20b6b255d3a59c45207
|
2018-03-16 03:04:54 +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 |
|
Jason Monk
|
72524977d7
|
Merge "SliceManager: Relax explicit checks on map a little bit" into pi-dev am: 0b795eb88e
am: 6bea8a4bb9
Change-Id: I06ad802554654b29964d8cba1b4572b7b1d37574
|
2018-03-16 02:58:42 +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
Change-Id: I1426a013c412b1c2f97ec62c531b63efe98a1717
|
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
Change-Id: I2dc8e043b9e6381085e3f066ac0705d106d54bac
|
2018-03-16 02:48:43 +00:00 |
|
Beverly
|
af774bc7fa
|
Merge "Set audio attrs on volume + home button vibrations" into pi-dev am: 9b449b75d2
am: 3c0f033160
Change-Id: Iabac1ea4cce06d74813d65d91553e44f40dcf459
|
2018-03-16 02:47:01 +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
Change-Id: Icefc33d69731bdbad6da56999011ab2a48b1036d
|
2018-03-16 02:41:29 +00:00 |
|
Miao-chen Chou
|
056975fa43
|
Merge "Bluetooth: preserve one advertisement slot for GMS core" am: 00cc1847d3 am: 922ae0237f
am: 158344f78a
Change-Id: Ia9f4c8845bb59509482ac0af8a569026fd1d7101
|
2018-03-16 02:41:14 +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 -s ours
Change-Id: I43739bfaf58e1d58c534263304cd1268c72f6ba8
|
2018-03-16 02:39:32 +00:00 |
|
Qingxi Li
|
d2655378d8
|
Merge "[UI Tweak] Move PIN eSIM error message button position" into pi-dev am: 2ac51aab99
am: 20cd66a16d
Change-Id: I9c7f04532550dcc9cc01a4a4b9ee1c3becf39d3d
|
2018-03-16 02:33:53 +00:00 |
|
Jaewan Kim
|
eb8e914ea7
|
Merge "MediaSession2: Remove MediaSession2#registerPlayerEventCallback()" into pi-dev
|
2018-03-16 02:32:44 +00:00 |
|