Commit Graph

415493 Commits

Author SHA1 Message Date
Kevin Rocard
4fd496d8bf Merge "Add documentation for the APC feature" into qt-dev am: ffc73ad49f
am: db16e64502

Change-Id: I2de8dda40ce8f341f59cfdc77b521f4850508999
2019-04-15 01:32:33 -07:00
Riddle Hsu
dcb8d8fe82 Merge "Reduce system calls of ThreadPriorityBooster" into qt-dev am: 00e76b8c13
am: c7ae454f87

Change-Id: I377ff2bf98364473f8af134f1f7ee0b94d233e18
2019-04-15 01:24:20 -07:00
Kevin Rocard
db16e64502 Merge "Add documentation for the APC feature" into qt-dev
am: ffc73ad49f

Change-Id: Id0263b23b0e86f46d88527dfdd48dc141c0bad8e
2019-04-15 01:20:38 -07:00
Riddle Hsu
c7ae454f87 Merge "Reduce system calls of ThreadPriorityBooster" into qt-dev
am: 00e76b8c13

Change-Id: I1cd901b20b5bd08519fde5c105de87c2e8664e94
2019-04-15 01:15:10 -07:00
Kevin Rocard
ffc73ad49f Merge "Add documentation for the APC feature" into qt-dev 2019-04-15 08:00:05 +00:00
TreeHugger Robot
00e76b8c13 Merge "Reduce system calls of ThreadPriorityBooster" into qt-dev 2019-04-15 07:59:34 +00:00
Martijn Coenen
f013e9b2e8 Merge changes Iac75e4f7,I6569bb45 into qt-dev am: 84cf1cb9e2
am: 33a49acd71

Change-Id: Iff8755afd2806b9c3c0ecbf9b834be49083fc52b
2019-04-15 00:33:57 -07:00
Martijn Coenen
33a49acd71 Merge changes Iac75e4f7,I6569bb45 into qt-dev
am: 84cf1cb9e2

Change-Id: I26f5f76d439f2c29dbac1f5fd81bf641028f5c95
2019-04-15 00:25:11 -07:00
Martijn Coenen
84cf1cb9e2 Merge changes Iac75e4f7,I6569bb45 into qt-dev
* changes:
  Fix Application Zygote use for external services.
  Refactor hostingType/hostingName/hostingNameStr.
2019-04-15 07:11:36 +00:00
Sungsoo Lim
59e70f6773 Merge "Tweak the selection of media button session" into qt-dev am: a498804d40
am: 575a8a4586

Change-Id: Idb400ac47f5fd85eb454fccd970ec235470ddd57
2019-04-14 23:19:14 -07:00
Sungsoo Lim
575a8a4586 Merge "Tweak the selection of media button session" into qt-dev
am: a498804d40

Change-Id: Ibcddaf35d91ae7c646b11a46b44ff2e7143315b8
2019-04-14 23:10:24 -07:00
Kyunglyul Hyun
28e4127c09 [automerger skipped] Merge "DO NOT MERGE: Revert "Media: Add MediaRouterManager to control media route of other apps"" into qt-dev am: 88774ef6eb
am: 86ed242bd8 -s ours
am skip reason: subject contains skip directive

Change-Id: I458c428918c02b0e2087b91749c8e562b8561d8e
2019-04-14 23:05:54 -07:00
Kyunglyul Hyun
86ed242bd8 Merge "DO NOT MERGE: Revert "Media: Add MediaRouterManager to control media route of other apps"" into qt-dev
am: 88774ef6eb

Change-Id: I946451446323edc3dfbfc2e028cca887440d0a3c
2019-04-14 23:01:18 -07:00
Sungsoo Lim
a498804d40 Merge "Tweak the selection of media button session" into qt-dev 2019-04-15 05:55:27 +00:00
TreeHugger Robot
88774ef6eb Merge "DO NOT MERGE: Revert "Media: Add MediaRouterManager to control media route of other apps"" into qt-dev 2019-04-15 05:47:22 +00:00
Howard Chen
c4abb85f1c [automerger skipped] Merge "Add SD card support for AOT" into qt-dev am: d71df284c5
am: 07509412c4 -s ours
am skip reason: change_id I1b35b39b207a68236bc44f8b3c4b952c7dbd5a1e with SHA1 dc0ebba510 is in history

Change-Id: Icaeaef2cd1ff253afaa689e4890788bdf29ed185
2019-04-14 21:20:09 -07:00
Howard Chen
07509412c4 Merge "Add SD card support for AOT" into qt-dev
am: d71df284c5

Change-Id: I7d77edba5cbd5d9a3d76e7678b09e1daae1108c2
2019-04-14 21:10:31 -07:00
Jeff Sharkey
c1da20d12e Merge "Renaming or moving files should initiate scan." into qt-dev am: b9c822d6b7
am: 10c5887712

Change-Id: Ib14a46db2049bf708f944ae41bc8513ad507e45c
2019-04-14 20:54:11 -07:00
TreeHugger Robot
d71df284c5 Merge "Add SD card support for AOT" into qt-dev 2019-04-15 03:53:09 +00:00
Jeff Sharkey
10c5887712 Merge "Renaming or moving files should initiate scan." into qt-dev
am: b9c822d6b7

Change-Id: I465e7972552802e1e5c72f36e723bcde2c027c19
2019-04-14 20:45:17 -07:00
Jeff Sharkey
b9c822d6b7 Merge "Renaming or moving files should initiate scan." into qt-dev 2019-04-15 03:27:32 +00:00
Kyunglyul Hyun
a1c7990bc4 DO NOT MERGE: Revert "Media: Add MediaRouterManager to control media route of other apps"
This reverts commit 1c8188f2b4.

Bug: 130511870
Test: atest android.media.cts.MediaRouterTest
Change-Id: I1de6fbeb81b1d5ef0ec4b73173b6525d4c6edc07
2019-04-15 11:44:55 +09:00
Sungsoo Lim
cc19772447 Tweak the selection of media button session
Key events were sent to the session which the lastly activated player app has.
After this CL, key events will be sent to a session 1) which the app
making sounds has, or 2) which the lastly activated player app has.

Bug: 113240750
Test: manually
Change-Id: I6ac128458fd0d30c9e0ed3382939ca9e4e581e22
2019-04-15 09:08:55 +09:00
Hyundo Moon
b9a4f63339 Merge "MediaSession2: Introduce connection hints" into qt-dev am: cf44c41158
am: caf49658f7

Change-Id: I87f8d16c4af077bd1094f1205339fbd2db05ccec
2019-04-14 15:56:05 -07:00
Hyundo Moon
caf49658f7 Merge "MediaSession2: Introduce connection hints" into qt-dev
am: cf44c41158

Change-Id: Ie086575a732b80065dbbc510a1593e9d50f45922
2019-04-14 15:42:45 -07:00
TreeHugger Robot
cf44c41158 Merge "MediaSession2: Introduce connection hints" into qt-dev 2019-04-14 22:19:05 +00:00
Dianne Hackborn
e6ac21c48e Merge "Add "identifier" concept to Intent." into qt-dev am: 91ada88e84
am: 2b9d732284

Change-Id: Ic34406e21d2be9927c05ed0636a86a52fce8aca9
2019-04-14 15:03:07 -07:00
Jeff Sharkey
881e286813 Merge "Remove temporary upgrade logic." into qt-dev am: 12efd33993
am: efeff3ba0d

Change-Id: Ib66c2d7793eb89147aebbcc3e1fc56c6b1955fe2
2019-04-14 14:51:09 -07:00
Dianne Hackborn
2b9d732284 Merge "Add "identifier" concept to Intent." into qt-dev
am: 91ada88e84

Change-Id: I5947a082ddda914d34b82a728715933c8eab20fd
2019-04-14 14:48:53 -07:00
Jeff Sharkey
efeff3ba0d Merge "Remove temporary upgrade logic." into qt-dev
am: 12efd33993

Change-Id: I95052b1929c4760b371aa8a58157cca8823166d1
2019-04-14 14:37:05 -07:00
Dianne Hackborn
91ada88e84 Merge "Add "identifier" concept to Intent." into qt-dev 2019-04-14 21:17:58 +00:00
Jeff Sharkey
12efd33993 Merge "Remove temporary upgrade logic." into qt-dev 2019-04-14 21:17:11 +00:00
Jeff Sharkey
db73a7da26 Renaming or moving files should initiate scan.
These FileSystemProvider operations should initiate a MediaStore scan
to ensure that it presents an updated view of the filesystem.

Bug: 129901992, 130356514
Test: manual
Change-Id: I612481282cf739b88a1637b147fb4d4555fb5b8f
2019-04-14 12:23:37 -06:00
Hyunyoung Song
6bc27343bc Merge "Add missing icon packs for Launcher Bug: 126738409 Test: builds, flashed, visually verified" into qt-dev am: 69eddb0fd8
am: d4a83bf3d9

Change-Id: I39d6c15381690b1bf86543fb707adb69bd77e945
2019-04-13 23:56:09 -07:00
Hyunyoung Song
d4a83bf3d9 Merge "Add missing icon packs for Launcher Bug: 126738409 Test: builds, flashed, visually verified" into qt-dev
am: 69eddb0fd8

Change-Id: I2d1eb55c0a43332809d559fb57e27455ec8d88f5
2019-04-13 23:47:14 -07:00
TreeHugger Robot
69eddb0fd8 Merge "Add missing icon packs for Launcher Bug: 126738409 Test: builds, flashed, visually verified" into qt-dev 2019-04-14 06:24:37 +00:00
Sudheer Shanka
163c6baab4 Merge "Deprecate MediaStore.DownloadColumns.DESCRIPTION." into qt-dev am: f54654945d
am: dd820942ee

Change-Id: Ibd9dd01bc9eb248796f169ac2cd2d9c1e8ca2af6
2019-04-13 13:27:19 -07:00
Sudheer Shanka
dd820942ee Merge "Deprecate MediaStore.DownloadColumns.DESCRIPTION." into qt-dev
am: f54654945d

Change-Id: I5447c7cfb92e17ce909a0db7c324ad498de64516
2019-04-13 13:19:16 -07:00
Sudheer Shanka
f54654945d Merge "Deprecate MediaStore.DownloadColumns.DESCRIPTION." into qt-dev 2019-04-13 20:01:10 +00:00
Vishnu Nair
aa220ec6c6 Merge "ActivityMetricsLogger: Fix cold launches treated incorrectly as invalid transitions" into qt-dev am: 850c6dcf09
am: 81d7e8e37c

Change-Id: I2fae99d418d6a2672480b6dd9a49b2ea81fbe354
2019-04-13 11:46:45 -07:00
Vishnu Nair
81d7e8e37c Merge "ActivityMetricsLogger: Fix cold launches treated incorrectly as invalid transitions" into qt-dev
am: 850c6dcf09

Change-Id: Ia7760f4f20de92bbff37982c2956bc390409430a
2019-04-13 11:37:53 -07:00
TreeHugger Robot
850c6dcf09 Merge "ActivityMetricsLogger: Fix cold launches treated incorrectly as invalid transitions" into qt-dev 2019-04-13 18:21:34 +00:00
Bill Yi
c43bb52406 [automerger skipped] Merge "Import translations. DO NOT MERGE" am: 8ab8829243 -s ours am: f5cee73db0 -s ours
am: 63a8d658e1 -s ours
am skip reason: subject contains skip directive

Change-Id: I67acd6a81ee1c3a997abc6aeb2e02581431a55f6
2019-04-13 07:53:36 -07:00
Bill Yi
63a8d658e1 [automerger skipped] Merge "Import translations. DO NOT MERGE" am: 8ab8829243 -s ours
am: f5cee73db0 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib0b12b85a4a162ca0d6b1542e20580600ac32d15
2019-04-13 07:48:37 -07:00
Bill Yi
f5cee73db0 [automerger skipped] Merge "Import translations. DO NOT MERGE"
am: 8ab8829243 -s ours
am skip reason: subject contains skip directive

Change-Id: I026bc44a62904e34e386acd59055a9a191a2beff
2019-04-13 07:43:34 -07:00
Philip P. Moltmann
16d33c5808 Merge "Fix re-installation via package uri-s" into qt-dev am: e062b5cce4
am: a17057536d

Change-Id: Ic8fb1d1cc15844d3e64baeeb7a419ffeb7ff1962
2019-04-13 07:42:58 -07:00
Treehugger Robot
8ab8829243 Merge "Import translations. DO NOT MERGE" 2019-04-13 14:36:12 +00:00
Philip P. Moltmann
a17057536d Merge "Fix re-installation via package uri-s" into qt-dev
am: e062b5cce4

Change-Id: Iebb2e8fd5951bb9bc1145efb04603cafdd47881d
2019-04-13 07:29:58 -07:00
TreeHugger Robot
e062b5cce4 Merge "Fix re-installation via package uri-s" into qt-dev 2019-04-13 14:12:03 +00:00
Bill Yi
914d6b96d7 [automerger skipped] Merge "Import translations. DO NOT MERGE" am: 88516600bb -s ours am: 37de97d503 -s ours
am: 768d7894bd -s ours
am skip reason: subject contains skip directive

Change-Id: Ic0a36b4b8e876ef9092744f9614f3b33a8044424
2019-04-13 06:00:22 -07:00