Kyunglyul Hyun
dd3f305bb3
DO NOT MERGE: Revert "Media: Add MediaRouterManager to control media route of other apps"
...
This reverts commit 1c8188f2b40cad3dcefdcc3b7e308451bd705180.
Test: atest android.media.cts.MediaRouterTest
Change-Id: I1de6fbeb81b1d5ef0ec4b73173b6525d4c6edc07
2019-04-10 11:56:00 +09:00
Bill Yi
ded8fe9246
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 568b02ee00 -s ours
...
am: 5e7a4efa25 -s ours
am skip reason: subject contains skip directive
Change-Id: Iddb5f2ef52732ae808141889bed7c36830b020be
2019-04-08 17:31:03 -07:00
Fabian Kozynski
c506a5fc94
Merge "Visual changes to QS header" into qt-dev am: e19335a443
...
am: 5e59d60b3d
Change-Id: I7f0a968de014028a0ec68243582e40c7a02d15e7
2019-04-08 17:30:25 -07:00
sqian
d853f68858
[automerger skipped] Merge "Fix documentation of CallRedirectionService" am: 820a7b5144 am: 3c9e9d1939 -s ours
...
am: 2881e89cee -s ours
am skip reason: change_id I48f60b3c4a465e22250aa513a4d7d73f82375426 with SHA1 87833ee867 is in history
Change-Id: I137c9203ef9c40b947a73bb6696290419d167dff
2019-04-08 17:23:21 -07:00
Remi NGUYEN VAN
1b667cf1d5
Merge "[automerger skipped] Merge "Add FrameworksNetTests dependency on libcgrouprc" am: 3729b26f8a -s ours am: 204ef43f56 -s ours
...
am: 1704d678ff -s ours
am skip reason: change_id Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 with SHA1 061cec7755 is in history
Change-Id: If2094e6df4674d0c32f7d79b09b7f182d3284b3f
2019-04-08 16:40:42 -07:00
Kyeongkab.Nam
4a57bab027
Merge "Merge "Fix exception of unregisterCallback when callback is not registered" am: 43b75cad9e am: d526de2ca2" into qt-dev-plus-aosp
...
am: 1b846b4604
Change-Id: If20741319174bf3bb9a9addddc47b8fc55ec023f
2019-04-08 16:32:17 -07:00
Lucas Lin
d135418cbc
Merge "Merge "Prevent SIGN_IN notification pop up several times" am: 83152b1e5f am: d454c3c276" into qt-dev-plus-aosp
...
am: b1a0373791
Change-Id: I6db72138f6ba72f35f027ff5cf7e908dcb8ad121
2019-04-08 16:18:14 -07:00
Remi NGUYEN VAN
58fa981cac
Merge "Merge "Add NetworkStackTests dependency on libdl_android" am: 1178972d68 am: 070e341303" into qt-dev-plus-aosp
...
am: 074053853c
Change-Id: I23e1fc7abd34350389ddbe6a50c5d5bb7be44838
2019-04-08 16:03:42 -07:00
Anil Admal
d43326dac5
Merge "Merge "Extend support for requestRouteToHostAddress for backward compatibility" am: fa45c06a62 am: b85b487e31" into qt-dev-plus-aosp
...
am: 7fecc34996
Change-Id: Ifa4ec98d5c942522dfd569664f169fa841d495ed
2019-04-08 15:49:09 -07:00
Lorenzo Colitti
5870f38e44
Merge "Merge "Disable InetDiagSocketTest in a better way." am: c28356b9c6 am: cc94ad60b0" into qt-dev-plus-aosp
...
am: 8818a8c6c7
Change-Id: I1fcb9ca292777fb017e9108a3e12cffba87e1985
2019-04-08 15:34:52 -07:00
Mark Renouf
504d05c106
Merge "BubbleData [2/n]: adds Listener interface" into qt-dev am: 4c916ecf7c
...
am: 5381f32888
Change-Id: I97039e1428554a15af19dea0914aba29837926e2
2019-04-08 15:20:46 -07:00
Shuo Qian
5e5d6b25b5
Merge "[automerger skipped] Merge "Clean up Call redirection setting" am: 9d6ac63e5e am: d4b3f65d35 -s ours
...
am: ec91922c54 -s ours
am skip reason: change_id I9cb569bfd1ef5fba7958bb2e5f42f05e300e3358 with SHA1 fa9460a6f0 is in history
Change-Id: I35b4681e47db8c1bd3a4418e9c52f880c5268a4f
2019-04-08 15:14:56 -07:00
Winson Chung
32e4cadbbb
Merge "Merge "Defer broadcasting ACTION_DEFERRED_ACTIVITY_CHANGED until actual change" into qt-dev am: f883ea697e" into qt-dev-plus-aosp
...
am: 310c197142
Change-Id: I3c0216435494cfb868a8dbbd1d2492bc584091a3
2019-04-08 15:06:34 -07:00
Tobias Thierer
cb62f8be16
Merge "Merge changes I4e32a588,I202c5653 am: 003ab94333 am: b7ca85651f" into qt-dev-plus-aosp
...
am: eb553b0df7
Change-Id: I5db1636a8c694e8b10c04800e7959747304c6b1b
2019-04-08 14:54:22 -07:00
Bookatz
3672ed7304
Merge "Merge "UserRestrictionsUtil.isValidRestriction wtfs" into qt-dev am: a126a24c52" into qt-dev-plus-aosp
...
am: 3f176785c5
Change-Id: Idd5f4618e6fdb73121ba2746bee91636fece7241
2019-04-08 14:39:54 -07:00
Android Build Merger (Role)
cc9dd574ea
Merge "Merge "[automerger skipped] Merge "Improved the debug message" am: cacfab6728 am: 253a139102 -s ours am: 718d5723b0 -s ours am skip reason: change_id If786d51b35380f606bc388e29a441bb24a2792e0 with SHA1 0c92c23951 is in history"
2019-04-08 21:28:54 +00:00
Jack Yu
12687e7c29
Merge "[automerger skipped] Merge "Improved the debug message" am: cacfab6728 am: 253a139102 -s ours
...
am: 718d5723b0 -s ours
am skip reason: change_id If786d51b35380f606bc388e29a441bb24a2792e0 with SHA1 0c92c23951 is in history
Change-Id: I8d85d94af99802728441860a429263cacb7802ba
2019-04-08 14:28:32 -07:00
Miguel de Dios
ce032b6769
Merge "Revert a bad merge from ag/6938423"
2019-04-08 21:24:36 +00:00
Amith Yamasani
d7a780cac2
Merge "[automerger skipped] Merge "Fix for NetworkStats/Telephony deadlock" am: 0d4445f1e0 am: 24fc368617 -s ours
...
am: 8bbd520899 -s ours
am skip reason: change_id I9e8449e5a75db616e646f55c930ff82982fc9083 with SHA1 d78542bb52 is in history
Change-Id: I80311e518c083ac26eddd471f7ba15b52d2c94a6
2019-04-08 14:20:03 -07:00
Android Build Merger (Role)
cf63408050
Merge "Merge "[automerger skipped] Merge "Move NetworkStatsFactory into service directory" am: 48294e098f am: ee6ed6914f -s ours am: 3427f091e0 -s ours am skip reason: change_id Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 with SHA1 061cec7755 is in history"
2019-04-08 21:11:40 +00:00
Chenbo Feng
50954a9c09
Merge "[automerger skipped] Merge "Move NetworkStatsFactory into service directory" am: 48294e098f am: ee6ed6914f -s ours
...
am: 3427f091e0 -s ours
am skip reason: change_id Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 with SHA1 061cec7755 is in history
Change-Id: Ica19aba40268a7e4facbc35cb108ab9fdc1c1ada
2019-04-08 14:11:16 -07:00
TreeHugger Robot
3c270c8937
Merge "Import translations. DO NOT MERGE"
2019-04-08 21:09:54 +00:00
Nathan Harold
2ecdcb6f21
Revert a bad merge from ag/6938423
...
Bug: 130174575
Test: none
Change-Id: I7684f9e06f4d226010448e5520965a8733c43073
Merged-In: I7684f9e06f4d226010448e5520965a8733c43073
(cherry picked from commit 12f75864a214fd2de6968357d1d3ab7c02d0e5ae)
2019-04-08 21:07:23 +00:00
Bill Yi
8263c86878
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6b539282c2 -s ours
...
am: f32bcf72b6 -s ours
am skip reason: subject contains skip directive
Change-Id: I1874b6ccb4ce4957e55573e3aca9bc65dd904c19
2019-04-08 14:02:23 -07:00
Bill Yi
43eb7fd5df
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 7581837e06 -s ours
...
am: 2538206e20 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia1ba5ba206d776f123d05617cdabb50209085af4
2019-04-08 14:00:28 -07:00
Etan Cohen
c79fba8664
Merge "[AWARE] Add unit test - fix hashing bug" into qt-dev am: 6d98837eb6
...
am: 0e37a546fe
Change-Id: Ie6cb8ce301cb94db106a05815385626dd0d74e5a
2019-04-08 13:55:01 -07:00
Tobias Thierer
53f0af2992
Merge changes I4e32a588,I202c5653 into qt-dev am: 79dd28f874
...
am: b5b5e3f200
Change-Id: I143053674811ac38e02170c64632177b2cdbb69b
2019-04-08 13:43:23 -07:00
Bill Yi
5e7a4efa25
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 568b02ee00 -s ours
am skip reason: subject contains skip directive
Change-Id: I9ec14c25e952bf3c21d7895800d0b8b76539a99c
2019-04-08 13:33:14 -07:00
TreeHugger Robot
eb0e0c3b3c
Merge "iorap: Add a JobService for idle maintenance trace compilations"
2019-04-08 20:31:45 +00:00
Fabian Kozynski
5e59d60b3d
Merge "Visual changes to QS header" into qt-dev
...
am: e19335a443
Change-Id: I06d65d79063268e3ee529864eec15acd0b473c54
2019-04-08 13:26:20 -07:00
Jorim Jaggi
cf5b5ac636
Merge "Protect against null drawable" into qt-dev am: 85e35eb118
...
am: 23a9e4d20f
Change-Id: I5856f2b1a914772f290b385b2f9eb424c19740dd
2019-04-08 13:17:52 -07:00
sqian
2881e89cee
[automerger skipped] Merge "Fix documentation of CallRedirectionService" am: 820a7b5144
...
am: 3c9e9d1939 -s ours
am skip reason: change_id I48f60b3c4a465e22250aa513a4d7d73f82375426 with SHA1 87833ee867 is in history
Change-Id: Ic694dd40b626765edf6ab2c007d75fc9e6eefd8b
2019-04-08 13:15:08 -07:00
TreeHugger Robot
2588af8441
Merge "Make an Android-specific copy of Skia's Null GL interface"
2019-04-08 19:57:58 +00:00
Android Build Merger (Role)
1704d678ff
Merge "[automerger skipped] Merge "Add FrameworksNetTests dependency on libcgrouprc" am: 3729b26f8a -s ours am: 204ef43f56 -s ours am skip reason: change_id Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 with SHA1 f2f1f27098 is in history" into qt-dev-plus-aosp
2019-04-08 19:56:03 +00:00
Remi NGUYEN VAN
d7ba309e30
[automerger skipped] Merge "Add FrameworksNetTests dependency on libcgrouprc" am: 3729b26f8a -s ours
...
am: 204ef43f56 -s ours
am skip reason: change_id Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 with SHA1 f2f1f27098 is in history
Change-Id: I9118558df88aac3cca342592ff8aa8ca9030e2a5
2019-04-08 12:55:30 -07:00
TreeHugger Robot
568b02ee00
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-04-08 19:54:18 +00:00
Android Build Merger (Role)
1b846b4604
Merge "Merge "Fix exception of unregisterCallback when callback is not registered" am: 43b75cad9e am: d526de2ca2" into qt-dev-plus-aosp
2019-04-08 19:51:03 +00:00
Kyeongkab.Nam
3e12920345
Merge "Fix exception of unregisterCallback when callback is not registered" am: 43b75cad9e
...
am: d526de2ca2
Change-Id: I91b92f2cc5255124884c39cfddc449479efa7255
2019-04-08 12:50:30 -07:00
Fabian Kozynski
e19335a443
Merge "Visual changes to QS header" into qt-dev
2019-04-08 19:49:11 +00:00
Android Build Merger (Role)
e0be81a9bb
Merge "Merge "Merge "Opportunistic Sub Grouping Keys in CarrierConfig" am: 6a9faeee7e am: 03c007dcde" into qt-dev-plus-aosp am: f99863ee31"
2019-04-08 19:46:57 +00:00
Android Build Merger (Role)
b1a0373791
Merge "Merge "Prevent SIGN_IN notification pop up several times" am: 83152b1e5f am: d454c3c276" into qt-dev-plus-aosp
2019-04-08 19:46:14 +00:00
Lucas Lin
1b752e600b
Merge "Prevent SIGN_IN notification pop up several times" am: 83152b1e5f
...
am: d454c3c276
Change-Id: I11840eb0cd06885979f0823d6db05e3e4e0535bb
2019-04-08 12:45:40 -07:00
Nathan Harold
c609be28df
Merge "Merge "Opportunistic Sub Grouping Keys in CarrierConfig" am: 6a9faeee7e am: 03c007dcde" into qt-dev-plus-aosp
...
am: f99863ee31
Change-Id: Idc9fd2126ba05592a5ca532ed82d313748625f55
2019-04-08 12:45:28 -07:00
Android Build Merger (Role)
074053853c
Merge "Merge "Add NetworkStackTests dependency on libdl_android" am: 1178972d68 am: 070e341303" into qt-dev-plus-aosp
2019-04-08 19:41:16 +00:00
Remi NGUYEN VAN
73f66b3e92
Merge "Add NetworkStackTests dependency on libdl_android" am: 1178972d68
...
am: 070e341303
Change-Id: I332a55c4a28c1b94610270c4658460562bd4bef3
2019-04-08 12:40:48 -07:00
Android Build Merger (Role)
7fecc34996
Merge "Merge "Extend support for requestRouteToHostAddress for backward compatibility" am: fa45c06a62 am: b85b487e31" into qt-dev-plus-aosp
2019-04-08 19:36:26 +00:00
Anil Admal
2eea7ac272
Merge "Extend support for requestRouteToHostAddress for backward compatibility" am: fa45c06a62
...
am: b85b487e31
Change-Id: Ifa60d8f2d60aba4c4e2894dc612c224d45e3992d
2019-04-08 12:36:02 -07:00
Android Build Merger (Role)
8818a8c6c7
Merge "Merge "Disable InetDiagSocketTest in a better way." am: c28356b9c6 am: cc94ad60b0" into qt-dev-plus-aosp
2019-04-08 19:31:35 +00:00
Lorenzo Colitti
2373c8a129
Merge "Disable InetDiagSocketTest in a better way." am: c28356b9c6
...
am: cc94ad60b0
Change-Id: I3d8cebec00dde7d0b61469f36887cd5afface043
2019-04-08 12:31:01 -07:00
Mark Renouf
5381f32888
Merge "BubbleData [2/n]: adds Listener interface" into qt-dev
...
am: 4c916ecf7c
Change-Id: Ib0a2227866701e79d04b2a015f72aa55fc5d57b7
2019-04-08 12:30:20 -07:00
