Pavel Grafov
d12455daec
Merge "Move key eviction past system services user cleanup." into oc-mr1-dev
...
am: 03515d0ad2
2017-08-03 13:10:49 +00:00
Android Build Merger (Role)
de7f07a5c6
Merge "Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev am: 48ed8aa4d0 am: 76136dcf45" into oc-mr1-dev-plus-aosp
2017-08-03 13:04:17 +00:00
Android Build Merger (Role)
eee9fe304c
Merge "Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev am: 48ed8aa4d0 am: e64d0028ae" into oc-mr1-dev-plus-aosp
2017-08-03 13:03:34 +00:00
Robert Carr
6c3d299366
Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev am: 48ed8aa4d0
...
am: 76136dcf45
2017-08-03 13:01:46 +00:00
Android Build Merger (Role)
41ef097af3
Merge "Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev am: e8107cf358 am: b993a3a01d" into oc-mr1-dev-plus-aosp
2017-08-03 13:01:19 +00:00
Robert Carr
3f81745199
Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev am: 48ed8aa4d0
...
am: e64d0028ae
2017-08-03 13:01:15 +00:00
TreeHugger Robot
03515d0ad2
Merge "Move key eviction past system services user cleanup." into oc-mr1-dev
2017-08-03 12:59:57 +00:00
Adrian Roos
b8fb0f9d05
Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev am: e8107cf358
...
am: 5398051267
2017-08-03 12:59:00 +00:00
Adrian Roos
0313932539
Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev am: e8107cf358
...
am: b993a3a01d
2017-08-03 12:58:59 +00:00
Robert Carr
e64d0028ae
Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev
...
am: 48ed8aa4d0
2017-08-03 12:53:40 +00:00
Robert Carr
76136dcf45
Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev
...
am: 48ed8aa4d0
2017-08-03 12:53:38 +00:00
Adrian Roos
b993a3a01d
Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev
...
am: e8107cf358
2017-08-03 12:48:38 +00:00
Adrian Roos
5398051267
Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev
...
am: e8107cf358
2017-08-03 12:48:33 +00:00
TreeHugger Robot
48ed8aa4d0
Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev
2017-08-03 12:45:07 +00:00
TreeHugger Robot
e8107cf358
Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev
2017-08-03 12:34:59 +00:00
Kenny Guy
b453a5a782
Update work briefcase asset.
...
am: f74c2a6ff6
2017-08-03 12:30:53 +00:00
Przemyslaw Szczepaniak
f96c4d6d76
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""" am: 82d2bd4e40 am: f9caecd124 am: be71148d49
...
am: eefdc2c6f8
2017-08-03 11:04:32 +00:00
Przemyslaw Szczepaniak
eefdc2c6f8
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""" am: 82d2bd4e40 am: f9caecd124
...
am: be71148d49
2017-08-03 10:52:34 +00:00
Przemyslaw Szczepaniak
be71148d49
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""" am: 82d2bd4e40
...
am: f9caecd124
2017-08-03 10:40:54 +00:00
Przemyslaw Szczepaniak
f9caecd124
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."""
...
am: 82d2bd4e40
2017-08-03 10:30:05 +00:00
Przemyslaw Szczepaniak
82d2bd4e40
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."""
2017-08-03 10:15:24 +00:00
Kenny Guy
f74c2a6ff6
Update work briefcase asset.
...
Bug: 36497538
Test: Manual - visually checked icons.
Change-Id: I1d5dd1b80bd32667e47dfc4a1c355a5106271d72
(cherry picked from commit d49d28a8ae
2017-08-03 09:49:16 +00:00
Hugo Benichi
2096edd6f2
NsdManager: remove duplicated argument validation
...
am: cf96a1b36d
2017-08-03 07:28:16 +00:00
Hugo Benichi
cf96a1b36d
NsdManager: remove duplicated argument validation
...
This patch simplifies argument validation in NsdManager public api and
regroup duplicated validation into common methods.
This makes stack traces more actionable as now specific errors will
cause the api to throw exception from specific methods, whereas before
IllegalArgumentException would be thrown from inside the same api method
for different reasons.
This patch also includes a couple of other small cleanups.
Test: $ runtest -x frameworks/base/tests/net/../NsdManagerTest.java
Bug: 37013369
(cherry picked from commit ff3e6ccca1
2017-08-03 14:19:43 +09:00
Peter Qiu
1387d056f9
Merge "SettingsLib: wifi: add support for tracking carrier Wi-Fi APs" into oc-mr1-dev
...
am: fca9a47ba8
2017-08-03 04:36:31 +00:00
TreeHugger Robot
fca9a47ba8
Merge "SettingsLib: wifi: add support for tracking carrier Wi-Fi APs" into oc-mr1-dev
2017-08-03 04:28:24 +00:00
Kurt Nelson
ef5a4ca4e0
Merge "Version guard Application.onCreate strict mode fix" into oc-mr1-dev
...
am: e002f44005
2017-08-03 04:16:02 +00:00
TreeHugger Robot
e002f44005
Merge "Version guard Application.onCreate strict mode fix" into oc-mr1-dev
2017-08-03 04:04:13 +00:00
John Reck
0f03652ba8
Merge "Add check that layer size <= maxTextureSize" into oc-mr1-dev
...
am: 4c25f3dd43
2017-08-03 03:18:23 +00:00
TreeHugger Robot
4c25f3dd43
Merge "Add check that layer size <= maxTextureSize" into oc-mr1-dev
2017-08-03 03:11:18 +00:00
John Reck
639afe25f3
Merge "Address API review comments" into oc-mr1-dev
...
am: dd5afab0d4
2017-08-03 02:18:54 +00:00
TreeHugger Robot
dd5afab0d4
Merge "Address API review comments" into oc-mr1-dev
2017-08-03 02:10:16 +00:00
Android Build Merger (Role)
4cbf94c998
Merge "Merge "Check CookieHandler in setDataSource with cookies" into oc-dr1-dev am: 6a2ee3b180 am: c0fe5b2d88" into oc-mr1-dev-plus-aosp
2017-08-03 01:16:43 +00:00
Sungsoo Lim
167b6837dd
Merge "Check CookieHandler in setDataSource with cookies" into oc-dr1-dev am: 6a2ee3b180
...
am: 0553f96c0a
2017-08-03 01:13:52 +00:00
Sungsoo Lim
7438e1d7b8
Merge "Check CookieHandler in setDataSource with cookies" into oc-dr1-dev am: 6a2ee3b180
...
am: c0fe5b2d88
2017-08-03 01:13:44 +00:00
Sungsoo Lim
c0fe5b2d88
Merge "Check CookieHandler in setDataSource with cookies" into oc-dr1-dev
...
am: 6a2ee3b180
2017-08-03 01:03:48 +00:00
Sungsoo Lim
0553f96c0a
Merge "Check CookieHandler in setDataSource with cookies" into oc-dr1-dev
...
am: 6a2ee3b180
2017-08-03 01:03:46 +00:00
Sungsoo Lim
6a2ee3b180
Merge "Check CookieHandler in setDataSource with cookies" into oc-dr1-dev
2017-08-03 00:52:27 +00:00
Sungsoo Lim
09d62021d9
Check CookieHandler in setDataSource with cookies
...
If the caller of MediaPlayer.setDataSource has installed its own
CookieHandler when cookies are provided, MediaPlayer.setDataSource
requires that the CookieHandler has to be of CookieManager type.
Bug: 63638018
Test: manual
Change-Id: I1539d1fa83440ddfb00cc958cd46b9917fe3a296
2017-08-03 09:48:01 +09:00
Bill Yi
3d57a96042
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: e1f66b297d -s ours
...
am: 7eed96cc1c
2017-08-03 00:40:35 +00:00
Bill Yi
36bc960316
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: e1f66b297d -s ours
...
am: 37f90d5767
2017-08-03 00:37:41 +00:00
Dianne Hackborn
b49a3f1c3a
Merge "Add documentation for MIN notification interaction with fg services." into oc-mr1-dev
...
am: 530cfc1db3
2017-08-03 00:36:08 +00:00
Bill Yi
37f90d5767
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: e1f66b297d
2017-08-03 00:31:04 +00:00
Bill Yi
7eed96cc1c
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: e1f66b297d
2017-08-03 00:30:51 +00:00
TreeHugger Robot
530cfc1db3
Merge "Add documentation for MIN notification interaction with fg services." into oc-mr1-dev
2017-08-03 00:29:25 +00:00
Jeff Sharkey
9fb2386b27
Merge "Don't show scary UI when rescue party kicks in." into oc-mr1-dev
...
am: 7606d4798b
2017-08-03 00:25:45 +00:00
John Reck
66ce952a4e
Merge "Fix compile issue" am: 27b56eb03f am: 60c65f1a67 am: 11d331a2af
...
am: e25db57060
2017-08-03 00:22:13 +00:00
Android Build Merger (Role)
5c179e8edb
Merge "Merge "Move VR preference for portrait orientation." into oc-dr1-dev am: 7c4069d255 am: ebc05a6a42" into oc-mr1-dev-plus-aosp
2017-08-03 00:16:54 +00:00
Santos Cordon
9ff00ce6cc
Merge "Move VR preference for portrait orientation." into oc-dr1-dev am: 7c4069d255
...
am: ebc05a6a42
2017-08-03 00:14:15 +00:00
Steven Moreland
c704b0379f
Merge "com.android.server: use proper nativehelper headers" am: 41a7f5a64f -s ours am: 79e124c9c7 -s ours am: 0666e1cd5c -s ours
...
am: 4033c5e1b7
2017-08-03 00:12:49 +00:00
