OSDN Git Service
Pavel Grafov [Thu, 3 Aug 2017 13:21:19 +0000 (13:21 +0000)]
Merge "Move key eviction past system services user cleanup." into oc-mr1-dev am:
03515d0ad2
am:
d12455daec
Change-Id: Ic3db718fc5f25bda2e67e6da3f64ea8a1b691901
Robert Carr [Thu, 3 Aug 2017 13:16:10 +0000 (13:16 +0000)]
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
am:
de7f07a5c6
Change-Id: I358fdf24c452d49457802fc906ed7908d7c0f1e0
Robert Carr [Thu, 3 Aug 2017 13:13:48 +0000 (13:13 +0000)]
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
am:
eee9fe304c
Change-Id: Ibacf967f6dbf5a03752186e0a4c8750cabf15cae
Adrian Roos [Thu, 3 Aug 2017 13:11:55 +0000 (13:11 +0000)]
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
am:
41ef097af3
Change-Id: I2b7946250c6e61ad8dc0f8a4dafa3a3361be2c9a
Pavel Grafov [Thu, 3 Aug 2017 13:10:49 +0000 (13:10 +0000)]
Merge "Move key eviction past system services user cleanup." into oc-mr1-dev
am:
03515d0ad2
Change-Id: I206f33be06a993bcaef2fc68aa2c83bef80e6488
Adrian Roos [Thu, 3 Aug 2017 13:10:05 +0000 (13:10 +0000)]
Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev am:
e8107cf358 am:
5398051267
am:
b8fb0f9d05
Change-Id: Ib06fa5782299fcada3a27c3b6d3d4d7ac3ef3d31
Android Build Merger (Role) [Thu, 3 Aug 2017 13:04:17 +0000 (13:04 +0000)]
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
Android Build Merger (Role) [Thu, 3 Aug 2017 13:03:34 +0000 (13:03 +0000)]
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
Robert Carr [Thu, 3 Aug 2017 13:01:46 +0000 (13:01 +0000)]
Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev am:
48ed8aa4d0
am:
76136dcf45
Change-Id: I396e7552fd7c0a5c10e26c895c68bb54ca551f6b
Android Build Merger (Role) [Thu, 3 Aug 2017 13:01:19 +0000 (13:01 +0000)]
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
Robert Carr [Thu, 3 Aug 2017 13:01:15 +0000 (13:01 +0000)]
Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev am:
48ed8aa4d0
am:
e64d0028ae
Change-Id: Ib87b081ec02bfa030d0561cf12beac9d4b8ca692
TreeHugger Robot [Thu, 3 Aug 2017 12:59:57 +0000 (12:59 +0000)]
Merge "Move key eviction past system services user cleanup." into oc-mr1-dev
Adrian Roos [Thu, 3 Aug 2017 12:59:00 +0000 (12:59 +0000)]
Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev am:
e8107cf358
am:
5398051267
Change-Id: Iaae94ae22c4d11648f410ccd7f307ddca84967ce
Adrian Roos [Thu, 3 Aug 2017 12:58:59 +0000 (12:58 +0000)]
Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev am:
e8107cf358
am:
b993a3a01d
Change-Id: I41f6ab0a055ad149356287429fa0847e81db473a
Robert Carr [Thu, 3 Aug 2017 12:53:40 +0000 (12:53 +0000)]
Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev
am:
48ed8aa4d0
Change-Id: Ibee1aea584f3e4141806aad6c8e7a592ccc31503
Robert Carr [Thu, 3 Aug 2017 12:53:38 +0000 (12:53 +0000)]
Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev
am:
48ed8aa4d0
Change-Id: I3030c64c30f6c16dc9c8a01e21a5dc6b58cbd273
Adrian Roos [Thu, 3 Aug 2017 12:48:38 +0000 (12:48 +0000)]
Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev
am:
e8107cf358
Change-Id: I2042c1d15844e34929286e91283ddb9942faea8f
Adrian Roos [Thu, 3 Aug 2017 12:48:33 +0000 (12:48 +0000)]
Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev
am:
e8107cf358
Change-Id: I5bafabdfe40175ee15cd3258f1e0ed536a99f164
TreeHugger Robot [Thu, 3 Aug 2017 12:45:07 +0000 (12:45 +0000)]
Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev
Kenny Guy [Thu, 3 Aug 2017 12:42:56 +0000 (12:42 +0000)]
Update work briefcase asset. am:
f74c2a6ff6
am:
b453a5a782
Change-Id: Icf31ccc6a23c92433c96e5c24fb54d025f8d3b59
TreeHugger Robot [Thu, 3 Aug 2017 12:34:59 +0000 (12:34 +0000)]
Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev
Kenny Guy [Thu, 3 Aug 2017 12:30:53 +0000 (12:30 +0000)]
Update work briefcase asset.
am:
f74c2a6ff6
Change-Id: I127ca45f3a25de00bd8eac86dc2227ab3ad64dc3
Przemyslaw Szczepaniak [Thu, 3 Aug 2017 11:16:10 +0000 (11:16 +0000)]
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""" am:
82d2bd4e40 am:
f9caecd124 am:
be71148d49 am:
eefdc2c6f8
am:
f96c4d6d76
Change-Id: I51dc87579534fc8d349240c1b1d2373f21d375ba
Przemyslaw Szczepaniak [Thu, 3 Aug 2017 11:04:32 +0000 (11:04 +0000)]
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""" am:
82d2bd4e40 am:
f9caecd124 am:
be71148d49
am:
eefdc2c6f8
Change-Id: I8aa40435f0ad3477fef8f3c4650cdd30642acc91
Alan Stokes [Thu, 3 Aug 2017 11:00:35 +0000 (11:00 +0000)]
Merge "Fix trivial typo in javadoc for ActivityManager#getRunningTasks() Test: Comment change only"
Przemyslaw Szczepaniak [Thu, 3 Aug 2017 10:52:34 +0000 (10:52 +0000)]
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""" am:
82d2bd4e40 am:
f9caecd124
am:
be71148d49
Change-Id: Ibd4c390c610b20f2809b06045fa38e6231175599
Przemyslaw Szczepaniak [Thu, 3 Aug 2017 10:40:54 +0000 (10:40 +0000)]
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""" am:
82d2bd4e40
am:
f9caecd124
Change-Id: I69e18dc2838c9472b6962a181d3faa0873b27e38
Przemyslaw Szczepaniak [Thu, 3 Aug 2017 10:30:05 +0000 (10:30 +0000)]
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."""
am:
82d2bd4e40
Change-Id: I8d1fe014fdc3cfd190c5ce95ec963fa8c038552c
Przemyslaw Szczepaniak [Thu, 3 Aug 2017 10:15:24 +0000 (10:15 +0000)]
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."""
TreeHugger Robot [Thu, 3 Aug 2017 09:55:11 +0000 (09:55 +0000)]
Merge "Introduce new public API for specifying exact weight."
Kenny Guy [Tue, 20 Jun 2017 15:42:07 +0000 (16:42 +0100)]
Update work briefcase asset.
Bug:
36497538
Test: Manual - visually checked icons.
Change-Id: I1d5dd1b80bd32667e47dfc4a1c355a5106271d72
(cherry picked from commit
d49d28a8aee5ee00f5e8368bb1448b991608cf4a)
Hugo Benichi [Thu, 3 Aug 2017 07:38:46 +0000 (07:38 +0000)]
NsdManager: remove duplicated argument validation am:
cf96a1b36d
am:
2096edd6f2
Change-Id: I0aaf2006833f6eee00a7b25e4ccaa388d29d3a62
Hugo Benichi [Thu, 3 Aug 2017 07:28:16 +0000 (07:28 +0000)]
NsdManager: remove duplicated argument validation
am:
cf96a1b36d
Change-Id: I3cad605d34cd9612b6073e689dc4af04b1717413
Sudheer Shanka [Thu, 3 Aug 2017 05:53:03 +0000 (05:53 +0000)]
Merge "Refactor BatteryStatsImpl.updateCpuTimeLocked."
Hugo Benichi [Tue, 2 May 2017 04:36:28 +0000 (13:36 +0900)]
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
ff3e6ccca1715ae72c6499cc7c894d27f46e8403)
Change-Id: Icf047532aa551fbe0a70721cfb95507eaa84d51e
Peter Qiu [Thu, 3 Aug 2017 04:47:05 +0000 (04:47 +0000)]
Merge "SettingsLib: wifi: add support for tracking carrier Wi-Fi APs" into oc-mr1-dev am:
fca9a47ba8
am:
1387d056f9
Change-Id: Iad364bc777c571bac8aa1c31dcdc9e50ed815069
Peter Qiu [Thu, 3 Aug 2017 04:36:31 +0000 (04:36 +0000)]
Merge "SettingsLib: wifi: add support for tracking carrier Wi-Fi APs" into oc-mr1-dev
am:
fca9a47ba8
Change-Id: I2e892a455ded1cb364eb449d35601c0ca3b7f02f
TreeHugger Robot [Thu, 3 Aug 2017 04:28:24 +0000 (04:28 +0000)]
Merge "SettingsLib: wifi: add support for tracking carrier Wi-Fi APs" into oc-mr1-dev
Kurt Nelson [Thu, 3 Aug 2017 04:25:59 +0000 (04:25 +0000)]
Merge "Version guard Application.onCreate strict mode fix" into oc-mr1-dev am:
e002f44005
am:
ef5a4ca4e0
Change-Id: Icd4e4434901eecf0825421291791fc89b14ffea7
Kurt Nelson [Thu, 3 Aug 2017 04:16:02 +0000 (04:16 +0000)]
Merge "Version guard Application.onCreate strict mode fix" into oc-mr1-dev
am:
e002f44005
Change-Id: If8cb15b7bf2d5994f7895c9743d8cd0e81f78f6f
TreeHugger Robot [Thu, 3 Aug 2017 04:04:13 +0000 (04:04 +0000)]
Merge "Version guard Application.onCreate strict mode fix" into oc-mr1-dev
John Reck [Thu, 3 Aug 2017 03:30:39 +0000 (03:30 +0000)]
Merge "Add check that layer size <= maxTextureSize" into oc-mr1-dev am:
4c25f3dd43
am:
0f03652ba8
Change-Id: I589106c8d80a66b152c2978e1d3db84badef9ed5
John Reck [Thu, 3 Aug 2017 03:18:23 +0000 (03:18 +0000)]
Merge "Add check that layer size <= maxTextureSize" into oc-mr1-dev
am:
4c25f3dd43
Change-Id: I2e239c4c1e5d28952b95f1299daf8ac793cc7e0c
TreeHugger Robot [Thu, 3 Aug 2017 03:11:18 +0000 (03:11 +0000)]
Merge "Add check that layer size <= maxTextureSize" into oc-mr1-dev
TreeHugger Robot [Thu, 3 Aug 2017 02:34:39 +0000 (02:34 +0000)]
Merge "TTS: Ensure to callback onStop() from SynthesisPlaybackQueueItem."
John Reck [Thu, 3 Aug 2017 02:28:44 +0000 (02:28 +0000)]
Merge "Address API review comments" into oc-mr1-dev am:
dd5afab0d4
am:
639afe25f3
Change-Id: Ieb559e57ffa2cd99de05757b4e9b7a3f9ce26ceb
TreeHugger Robot [Thu, 3 Aug 2017 02:22:09 +0000 (02:22 +0000)]
Merge "Revert "Make ellipsize retry if text doesn't fit""
John Reck [Thu, 3 Aug 2017 02:18:54 +0000 (02:18 +0000)]
Merge "Address API review comments" into oc-mr1-dev
am:
dd5afab0d4
Change-Id: Ia6f1c19275c2a06d35a344bb2e14c376c9794088
TreeHugger Robot [Thu, 3 Aug 2017 02:10:16 +0000 (02:10 +0000)]
Merge "Address API review comments" into oc-mr1-dev
Sungsoo Lim [Thu, 3 Aug 2017 01:45:39 +0000 (01:45 +0000)]
Merge "Merge "Check CookieHandler in setDataSource with cookies" into oc-dr1-dev am:
6a2ee3b180 am:
c0fe5b2d88" into oc-mr1-dev-plus-aosp
am:
4cbf94c998
Change-Id: Ia265cafc91d92594bb4cc592c043f0d57c4de4d6
Sungsoo Lim [Thu, 3 Aug 2017 01:43:32 +0000 (01:43 +0000)]
Merge "Check CookieHandler in setDataSource with cookies" into oc-dr1-dev am:
6a2ee3b180 am:
0553f96c0a
am:
167b6837dd
Change-Id: I45dec1e4f76ab3550e00492294ee0523f48ad963
Bill Yi [Thu, 3 Aug 2017 01:40:06 +0000 (01:40 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
e1f66b297d -s ours am:
7eed96cc1c -s ours
am:
3d57a96042 -s ours
Change-Id: I7bef4cc203c6d162f9333a5f4c2948cecc167e69
Bill Yi [Thu, 3 Aug 2017 01:38:25 +0000 (01:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
e1f66b297d -s ours am:
37f90d5767 -s ours
am:
36bc960316 -s ours
Change-Id: I369b5eb23140b112f2cd5fcc0295bf84d0c29bfa
Dianne Hackborn [Thu, 3 Aug 2017 01:36:55 +0000 (01:36 +0000)]
Merge "Add documentation for MIN notification interaction with fg services." into oc-mr1-dev am:
530cfc1db3
am:
b49a3f1c3a
Change-Id: Idea07952532a5567aff62d70ad3572f6edec6e5b
Jeff Sharkey [Thu, 3 Aug 2017 01:35:10 +0000 (01:35 +0000)]
Merge "Don't show scary UI when rescue party kicks in." into oc-mr1-dev am:
7606d4798b
am:
9fb2386b27
Change-Id: Ibb66f14f6f172fac57ea9070f2c8080f60daf0fe
John Reck [Thu, 3 Aug 2017 01:33:30 +0000 (01:33 +0000)]
Merge "Fix compile issue" am:
27b56eb03f am:
60c65f1a67 am:
11d331a2af am:
e25db57060
am:
66ce952a4e
Change-Id: I6882e50bfade31b43c71569a6fdff28d1ae86857
Santos Cordon [Thu, 3 Aug 2017 01:31:44 +0000 (01:31 +0000)]
Merge "Merge "Move VR preference for portrait orientation." into oc-dr1-dev am:
7c4069d255 am:
ebc05a6a42" into oc-mr1-dev-plus-aosp
am:
5c179e8edb
Change-Id: I0098636d5346993396d3c05c61525076e0fa5279
Steven Moreland [Thu, 3 Aug 2017 01:29:35 +0000 (01:29 +0000)]
Merge "com.android.server: use proper nativehelper headers" am:
41a7f5a64f -s ours am:
79e124c9c7 -s ours am:
0666e1cd5c -s ours am:
4033c5e1b7 -s ours
am:
c704b0379f -s ours
Change-Id: I9e8ab06e4b6e9f08bb01909efbb0aff03c44bb67
Ningyuan Wang [Thu, 3 Aug 2017 01:27:18 +0000 (01:27 +0000)]
Merge "Merge "Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev am:
54e6518fc8" into oc-mr1-dev am:
b1e8d97867" into oc-mr1-dev-plus-aosp
am:
60d63fa4fb
Change-Id: I68a0642f288973a25d1756508e23313f2e318c06
Christine Franks [Thu, 3 Aug 2017 01:25:05 +0000 (01:25 +0000)]
Merge "Merge "Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev am:
8d753bc3a3" into oc-mr1-dev am:
93111a9762" into oc-mr1-dev-plus-aosp
am:
f0747920e0
Change-Id: If2095bfcc7408c9ccbe5384f001339a84766d932
Adrian Roos [Thu, 3 Aug 2017 01:23:12 +0000 (01:23 +0000)]
Merge "Merge "Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev am:
46f2cdeb63" into oc-mr1-dev am:
ad825bdfd7" into oc-mr1-dev-plus-aosp
am:
64cd09456d
Change-Id: I3b87a4a25e69d01526cd5f051cdf9d3553c1ad1c
Sudheer Shanka [Tue, 25 Jul 2017 16:55:03 +0000 (09:55 -0700)]
Refactor BatteryStatsImpl.updateCpuTimeLocked.
Bug:
62240247
Test: bit FrameworksCoreTests:com.android.internal.os.BatteryStatsTests
Change-Id: I666c44ef9cb4e0720564b161da0ff1c94f15d5b9
Brad Ebinger [Thu, 3 Aug 2017 01:19:47 +0000 (01:19 +0000)]
Merge "Merge "Merge "Remove Conferenceable update squelching" into oc-dr1-dev am:
4b6ef9c92d" into oc-mr1-dev am:
e57175c090" into oc-mr1-dev-plus-aosp
am:
482e35d51a
Change-Id: I59d952ec0dd395d7b553ca4edb9b71c51a300b97
Android Build Merger (Role) [Thu, 3 Aug 2017 01:16:43 +0000 (01:16 +0000)]
Merge "Merge "Check CookieHandler in setDataSource with cookies" into oc-dr1-dev am:
6a2ee3b180 am:
c0fe5b2d88" into oc-mr1-dev-plus-aosp
Tarandeep Singh [Thu, 3 Aug 2017 01:15:07 +0000 (01:15 +0000)]
Merge "Merge "Merge "Fix keyboard focus in VR" into oc-dr1-dev am:
986995d481" into oc-mr1-dev am:
1cec6be3f5" into oc-mr1-dev-plus-aosp
am:
68122681b9
Change-Id: Ia0d7088975b03d978e66b6d6ed5f209a3159014b
Sungsoo Lim [Thu, 3 Aug 2017 01:13:52 +0000 (01:13 +0000)]
Merge "Check CookieHandler in setDataSource with cookies" into oc-dr1-dev am:
6a2ee3b180
am:
0553f96c0a
Change-Id: I4559ce2ec092c1855cb09316e5323d0cb33da31f
Sungsoo Lim [Thu, 3 Aug 2017 01:13:44 +0000 (01:13 +0000)]
Merge "Check CookieHandler in setDataSource with cookies" into oc-dr1-dev am:
6a2ee3b180
am:
c0fe5b2d88
Change-Id: Ide73412189493c193f53b3118a2dc57391ffe70e
Chien-Yu Chen [Thu, 3 Aug 2017 01:12:11 +0000 (01:12 +0000)]
Merge "Merge "Merge "camera2: Fix template requirements" into oc-dev am:
2976109d89 am:
615f9e1277" into oc-mr1-dev am:
334e733ea2" into oc-mr1-dev-plus-aosp
am:
8483409421
Change-Id: I5446a96e0aab856aed2d42e950fc00d7abc03e60
Santos Cordon [Thu, 3 Aug 2017 01:10:08 +0000 (01:10 +0000)]
Merge "Merge "Move VR preference for portrait orientation." into oc-dr1-dev am:
7c4069d255 am:
5af217b346" into oc-mr1-dev-plus-aosp
am:
faf9590064
Change-Id: I3c3372dfcc55d38b37e8fedafaf494343e44e119
Santos Cordon [Thu, 3 Aug 2017 01:07:52 +0000 (01:07 +0000)]
Merge "Merge "Merge "Ensure that all displays are updated upon any changes to rotation." into oc-dr1-dev am:
adec8518af" into oc-mr1-dev am:
988a6dd5e3" into oc-mr1-dev-plus-aosp
am:
5b9d5fe641
Change-Id: Ie359b22486c753a98522882c021e90f8b4c1be63
Sungsoo Lim [Thu, 3 Aug 2017 01:03:48 +0000 (01:03 +0000)]
Merge "Check CookieHandler in setDataSource with cookies" into oc-dr1-dev
am:
6a2ee3b180
Change-Id: Ia42104e2fb75d867279fe8d553c807d5dcfac06d
Sungsoo Lim [Thu, 3 Aug 2017 01:03:46 +0000 (01:03 +0000)]
Merge "Check CookieHandler in setDataSource with cookies" into oc-dr1-dev
am:
6a2ee3b180
Change-Id: I28f5b461d1c0e7f25868af780125c2f8ba356a89
Josh Gao [Thu, 3 Aug 2017 01:03:29 +0000 (01:03 +0000)]
Merge "Merge "zygote: always log process exit reason." am:
b14694b043 am:
1453059ae3 am:
c4f129121e am:
1535b8ca3b" into oc-mr1-dev-plus-aosp
am:
1a23e3c461
Change-Id: I75e8d2889b7671a3806478c42aab7c238a44b8eb
Selim Cinek [Thu, 3 Aug 2017 01:01:17 +0000 (01:01 +0000)]
Merge "Merge "Fixed a clipping issue in AOD" into oc-dr1-dev am:
0ee78fd385" into oc-mr1-dev am:
4f4535500e
am:
5135014626
Change-Id: Ia4813c198bf9fb5dd3c3bea7de33751b47fde17e
Jorim Jaggi [Thu, 3 Aug 2017 00:59:32 +0000 (00:59 +0000)]
Merge "Merge "Start all visible running activities when attaching app" into oc-dr1-dev am:
2af6f25f43" into oc-mr1-dev am:
966fbc0435
am:
93cc4ae19b
Change-Id: I447c10f04b0cec75e4ae12f8fa05df27a04b8441
Ningyuan Wang [Thu, 3 Aug 2017 00:57:08 +0000 (00:57 +0000)]
Merge "Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev am:
54e6518fc8 am:
2ac51662c2" into oc-mr1-dev-plus-aosp
am:
3debaf9639
Change-Id: I4c3a0ba70d7270ff52e6eae2a9a68b593b4400b7
Christine Franks [Thu, 3 Aug 2017 00:55:15 +0000 (00:55 +0000)]
Merge "Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev am:
8d753bc3a3 am:
27191ac475" into oc-mr1-dev-plus-aosp
am:
a336d8a57b
Change-Id: I7bc11d9f0dca717c850c0de3f86dcc835e0f92ca
Sungsoo Lim [Thu, 3 Aug 2017 00:52:27 +0000 (00:52 +0000)]
Merge "Check CookieHandler in setDataSource with cookies" into oc-dr1-dev
Steven Moreland [Thu, 3 Aug 2017 00:49:28 +0000 (00:49 +0000)]
Merge "Merge "services.core: remove use of -static hidl java" into stage-aosp-master am:
e79a0931f7 am:
9bd5b76318 -s ours am:
9dbda410bc -s ours" into oc-mr1-dev-plus-aosp
am:
67433d3fe8 -s ours
Change-Id: Id726896f8e89d3281826b3fd0b498f463b02bd05
Sungsoo Lim [Mon, 24 Jul 2017 13:29:27 +0000 (22:29 +0900)]
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
Adrian Roos [Thu, 3 Aug 2017 00:47:38 +0000 (00:47 +0000)]
Merge "Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev am:
46f2cdeb63 am:
21cd29e235" into oc-mr1-dev-plus-aosp
am:
62fe11f830
Change-Id: Ida4e0311b2d41f9dfaccd34a6bb19ec03f74e8ed
Adrian Roos [Thu, 3 Aug 2017 00:44:43 +0000 (00:44 +0000)]
Merge "Merge "Merge "SysUI: Move all sensor operations to the background thread" into oc-dr1-dev am:
e81cdeea1c" into oc-mr1-dev am:
17d16ef49b" into oc-mr1-dev-plus-aosp
am:
28ba07c40b
Change-Id: I16f0c6b54472151a4d77dc17ce99e076d1b57717
Bill Yi [Thu, 3 Aug 2017 00:40:35 +0000 (00:40 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
e1f66b297d -s ours
am:
7eed96cc1c -s ours
Change-Id: I1fe5f42babe19bd8d4b90d3bfff2877cf06a7fbe
Jeff Sharkey [Thu, 3 Aug 2017 00:38:01 +0000 (00:38 +0000)]
Merge "Merge "Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev am:
65abebbadd" into oc-mr1-dev am:
25cdef21dc" into oc-mr1-dev-plus-aosp
am:
f749719e53
Change-Id: Id188cf438f1425c266e6806f231fb65987a4f13c
Bill Yi [Thu, 3 Aug 2017 00:37:41 +0000 (00:37 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
e1f66b297d -s ours
am:
37f90d5767 -s ours
Change-Id: I575b7b2d41f1660de1628faf192e9031fd409a8a
Brad Ebinger [Thu, 3 Aug 2017 00:36:19 +0000 (00:36 +0000)]
Merge "Merge "Remove Conferenceable update squelching" into oc-dr1-dev am:
4b6ef9c92d am:
27d9ca08da" into oc-mr1-dev-plus-aosp
am:
b22e5a3b26
Change-Id: I693583e03a714bb4d8dbd2b6aefdb862ac0c0cdd
Dianne Hackborn [Thu, 3 Aug 2017 00:36:08 +0000 (00:36 +0000)]
Merge "Add documentation for MIN notification interaction with fg services." into oc-mr1-dev
am:
530cfc1db3
Change-Id: I2b1515dcc6acbffa43e1cfda1d1c8f68a077b1ad
Jeff Sharkey [Thu, 3 Aug 2017 00:34:26 +0000 (00:34 +0000)]
Merge "Merge "Give DeviceStorageMonitorService it's own thread." into oc-mr1-dev am:
fe268483d0" into oc-mr1-dev-plus-aosp
am:
86ff14f476
Change-Id: I93bf2a67e6d84cb91ff36d447c3fcd4156787e95
Bill Yi [Thu, 3 Aug 2017 00:31:04 +0000 (00:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
e1f66b297d -s ours
Change-Id: I533bd4785a565770f4b678b08aa64c27a9261833
Bill Yi [Thu, 3 Aug 2017 00:30:51 +0000 (00:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
e1f66b297d -s ours
Change-Id: I427a4ab63aca8bac7ff2c4a251052becf018b7d8
TreeHugger Robot [Thu, 3 Aug 2017 00:29:25 +0000 (00:29 +0000)]
Merge "Add documentation for MIN notification interaction with fg services." into oc-mr1-dev
Jeff Sharkey [Thu, 3 Aug 2017 00:25:45 +0000 (00:25 +0000)]
Merge "Don't show scary UI when rescue party kicks in." into oc-mr1-dev
am:
7606d4798b
Change-Id: Id2b9df26bc9752e10b7ff1a3b981d2721eb747a9
John Reck [Thu, 3 Aug 2017 00:22:13 +0000 (00:22 +0000)]
Merge "Fix compile issue" am:
27b56eb03f am:
60c65f1a67 am:
11d331a2af
am:
e25db57060
Change-Id: Ibf6b77fae613c255dbd85ff3b565d79bcd5f04bb
TreeHugger Robot [Thu, 3 Aug 2017 00:19:44 +0000 (00:19 +0000)]
Merge "Add backend ISO and Focal Length support to Metadata Reader"
Android Build Merger (Role) [Thu, 3 Aug 2017 00:16:54 +0000 (00:16 +0000)]
Merge "Merge "Move VR preference for portrait orientation." into oc-dr1-dev am:
7c4069d255 am:
ebc05a6a42" into oc-mr1-dev-plus-aosp
Santos Cordon [Thu, 3 Aug 2017 00:14:15 +0000 (00:14 +0000)]
Merge "Move VR preference for portrait orientation." into oc-dr1-dev am:
7c4069d255
am:
ebc05a6a42
Change-Id: I180ffea5b3ac59019b64f2d7859794faecf1fb10
Steven Moreland [Thu, 3 Aug 2017 00:12:49 +0000 (00:12 +0000)]
Merge "com.android.server: use proper nativehelper headers" am:
41a7f5a64f -s ours am:
79e124c9c7 -s ours am:
0666e1cd5c -s ours
am:
4033c5e1b7 -s ours
Change-Id: I0123c124dcd6f0b74af3c6c57783e318c0892323
TreeHugger Robot [Thu, 3 Aug 2017 00:12:34 +0000 (00:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
John Reck [Thu, 3 Aug 2017 00:06:48 +0000 (00:06 +0000)]
Merge "Fix compile issue" am:
27b56eb03f am:
60c65f1a67
am:
11d331a2af
Change-Id: I6f293b65cfc734beeafc510baa7121945de208e4
Android Build Merger (Role) [Thu, 3 Aug 2017 00:04:48 +0000 (00:04 +0000)]
Merge "Merge "Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev am:
54e6518fc8" into oc-mr1-dev am:
b1e8d97867" into oc-mr1-dev-plus-aosp
OSDN Git Service
