OSDN Git Service
Bill Yi [Wed, 24 May 2017 06:11:20 +0000 (23:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifc4e60acac93cc7e7971c2df13f79cf11c1017cc
Auto-generated-cl: translation import
Joel Fernandes [Tue, 23 May 2017 18:47:41 +0000 (18:47 +0000)]
Merge "Implement get_cpuset_cores_for_policy for SP_RT_APP"
Joel Fernandes [Tue, 23 May 2017 18:33:48 +0000 (18:33 +0000)]
Merge "Use THREAD_GROUP_RT_APP instead of THREAD_GROUP_AUDIO_APP"
Matthew Ng [Tue, 23 May 2017 18:04:38 +0000 (18:04 +0000)]
Merge "Fixed unminimizing during battery saving mode" into oc-dev am:
5b49464dc6
am:
37b03b9e72
Change-Id: I12e1586a3c1a7a9e506db822c3a779f7c633c50d
John Reck [Tue, 23 May 2017 18:01:09 +0000 (18:01 +0000)]
Merge "Improve time to texture destruction" into oc-dev am:
1bc0286ef8
am:
9d08fca62f
Change-Id: Iee16d786983734d138a408707cf5efd9f9c9b9fb
Matthew Ng [Tue, 23 May 2017 17:57:26 +0000 (17:57 +0000)]
Merge "Fixed unminimizing during battery saving mode" into oc-dev
am:
5b49464dc6
Change-Id: Id5efa71298cd71bb91aa3f08fb4bfe4eff43a183
Daniel Nishi [Tue, 23 May 2017 17:52:39 +0000 (17:52 +0000)]
Merge "batterymeter -> just meter." into oc-dev am:
da4c81d942
am:
5c05a04448
Change-Id: I12afdef1cda46b685274ce0c359ffec9650f25bd
John Reck [Tue, 23 May 2017 17:51:28 +0000 (17:51 +0000)]
Merge "Improve time to texture destruction" into oc-dev
am:
1bc0286ef8
Change-Id: I93daab53961a018a2cf8d4e2d4d8300b84bb917e
TreeHugger Robot [Tue, 23 May 2017 17:44:04 +0000 (17:44 +0000)]
Merge "Fixed unminimizing during battery saving mode" into oc-dev
Daniel Nishi [Tue, 23 May 2017 17:42:43 +0000 (17:42 +0000)]
Merge "batterymeter -> just meter." into oc-dev
am:
da4c81d942
Change-Id: I6500c46fc1b0fcbe290e9d610ac6506458ab9fca
Android Build Merger (Role) [Tue, 23 May 2017 17:38:44 +0000 (17:38 +0000)]
Merge "Merge "Fix makefile warning." am:
f523227a6e am:
9e317f8743 am:
1cb063d3ed am:
bb354909bd -s ours"
John Reck [Tue, 23 May 2017 17:38:36 +0000 (17:38 +0000)]
Merge "Improve time to texture destruction" into oc-dev
Evan Laird [Tue, 23 May 2017 17:37:18 +0000 (17:37 +0000)]
Merge "Remove logging from SlashDrawable"
Dan Willemsen [Tue, 23 May 2017 17:35:59 +0000 (17:35 +0000)]
Merge "Fix makefile warning." am:
f523227a6e am:
9e317f8743 am:
1cb063d3ed
am:
bb354909bd -s ours
Change-Id: I3723c521c15a30ef96ab93c410fd17f5d8e4028b
Daniel Nishi [Tue, 23 May 2017 17:35:14 +0000 (17:35 +0000)]
Merge "batterymeter -> just meter." into oc-dev
Dan Willemsen [Tue, 23 May 2017 17:25:09 +0000 (17:25 +0000)]
Merge "Fix makefile warning." am:
f523227a6e am:
9e317f8743
am:
1cb063d3ed
Change-Id: I83e952804b47ad50b1c8c9125ef36772f6571d69
Dan Willemsen [Tue, 23 May 2017 17:18:55 +0000 (17:18 +0000)]
Merge "Fix makefile warning." am:
f523227a6e
am:
9e317f8743
Change-Id: I8078c4dfbb3cbc55dd6d08888c67c31721a77397
Jorim Jaggi [Tue, 23 May 2017 17:17:11 +0000 (17:17 +0000)]
Merge "Fix window affecting SysUi visibility for once and all" into oc-dev am:
6cfc8afa7a
am:
768ce6edf6
Change-Id: Iac5ed116e1033ab741c123c2c758958ad914c493
Dan Willemsen [Tue, 23 May 2017 17:12:03 +0000 (17:12 +0000)]
Merge "Fix makefile warning."
am:
f523227a6e
Change-Id: I852b00eb0c562003307507d02e1dd80a7d42cf9f
Jorim Jaggi [Tue, 23 May 2017 17:11:57 +0000 (17:11 +0000)]
Merge "Fix window affecting SysUi visibility for once and all" into oc-dev
am:
6cfc8afa7a
Change-Id: I0bf707ab3ad162b1c7b868719d3347f489f51964
Winson Chung [Tue, 23 May 2017 17:11:55 +0000 (17:11 +0000)]
Merge "Fix issue with TV PIP clobbering resize on orientation change." into oc-dev am:
921078ab31
am:
3857f8b5c4
Change-Id: Ic7153eecf1792d827385115fd03d73f94efe5465
Winson Chung [Tue, 23 May 2017 17:06:53 +0000 (17:06 +0000)]
Merge "Fix issue with TV PIP clobbering resize on orientation change." into oc-dev
am:
921078ab31
Change-Id: Ie501b38fe561a37ab60069fae56b7b0f41f9016e
Dan Willemsen [Tue, 23 May 2017 16:58:46 +0000 (16:58 +0000)]
Merge "Fix makefile warning."
TreeHugger Robot [Tue, 23 May 2017 16:58:38 +0000 (16:58 +0000)]
Merge "Fix window affecting SysUi visibility for once and all" into oc-dev
John Reck [Tue, 23 May 2017 16:57:59 +0000 (16:57 +0000)]
Merge "Convert Shader to NativeAllocationRegistry" into oc-dev am:
3afc07ae7b
am:
e9caff5a8b
Change-Id: Iae516c640d5ad4c25b2dabe8c082980d784f7c93
TreeHugger Robot [Tue, 23 May 2017 16:54:44 +0000 (16:54 +0000)]
Merge "Fix issue with TV PIP clobbering resize on orientation change." into oc-dev
John Reck [Tue, 23 May 2017 16:51:19 +0000 (16:51 +0000)]
Merge "Convert Shader to NativeAllocationRegistry" into oc-dev
am:
3afc07ae7b
Change-Id: If30bf388289e5726edbb31b6b88343455e68b09c
John Reck [Tue, 23 May 2017 16:43:37 +0000 (16:43 +0000)]
Merge "Convert Shader to NativeAllocationRegistry" into oc-dev
Rob Carr [Tue, 23 May 2017 16:42:19 +0000 (16:42 +0000)]
Merge "SurfaceView: Wait to gather transparent region." into oc-dev am:
d9bf5ecf51
am:
3c78e73a33
Change-Id: Ifff868614ab70d9b99344abc41eab67745068937
Rob Carr [Tue, 23 May 2017 16:37:18 +0000 (16:37 +0000)]
Merge "SurfaceView: Wait to gather transparent region." into oc-dev
am:
d9bf5ecf51
Change-Id: I7690e2439276f9362f5fdeff0f789e9f1f3f7d91
Rob Carr [Tue, 23 May 2017 16:30:57 +0000 (16:30 +0000)]
Merge "SurfaceView: Wait to gather transparent region." into oc-dev
Abodunrinwa Toki [Tue, 23 May 2017 16:18:10 +0000 (16:18 +0000)]
Merge "Fix FloatingToolbar refresh on menu changes." into oc-dev am:
7c4998e614
am:
656d33f323
Change-Id: I1a31b55aaf5844241d926839c163f2a550f8a1e5
Abodunrinwa Toki [Tue, 23 May 2017 16:11:24 +0000 (16:11 +0000)]
Merge "Ensure FloatingActionMode has a non-null FloatingToolbar." into oc-dev am:
76ec0575bc
am:
29a03ce74e
Change-Id: I759aa487aa85d35322c7e1be5cc10e46ce5c5b7d
Abodunrinwa Toki [Tue, 23 May 2017 16:10:59 +0000 (16:10 +0000)]
Merge "Fix FloatingToolbar refresh on menu changes." into oc-dev
am:
7c4998e614
Change-Id: Id7e6c2485fa3a0519b77dd64498808d255f10fbc
Philipp Weiß [Tue, 23 May 2017 16:08:35 +0000 (16:08 +0000)]
Merge "Fix and add unittests for SecurityController"
Abodunrinwa Toki [Tue, 23 May 2017 16:05:15 +0000 (16:05 +0000)]
Merge "Ensure FloatingActionMode has a non-null FloatingToolbar." into oc-dev
am:
76ec0575bc
Change-Id: If1353fcbfc97a752bec758763caf1188b8c0daa3
TreeHugger Robot [Tue, 23 May 2017 16:01:31 +0000 (16:01 +0000)]
Merge "Fix FloatingToolbar refresh on menu changes." into oc-dev
TreeHugger Robot [Tue, 23 May 2017 15:57:44 +0000 (15:57 +0000)]
Merge "Ensure FloatingActionMode has a non-null FloatingToolbar." into oc-dev
Geoffrey Pitsch [Tue, 23 May 2017 15:48:52 +0000 (15:48 +0000)]
Use channel warning development setting. am:
507822decb
am:
fb84cb942c
Change-Id: If69549f00636f53a2d4ec59a462c967c70e44da9
TreeHugger Robot [Tue, 23 May 2017 15:45:17 +0000 (15:45 +0000)]
Merge "Fix recent apps in system UI for Skia pipeline"
Geoffrey Pitsch [Tue, 23 May 2017 15:41:48 +0000 (15:41 +0000)]
Use channel warning development setting.
am:
507822decb
Change-Id: I3913dc37725fb9807637e9a9b0112839284bb4cd
Evan Laird [Tue, 23 May 2017 15:39:46 +0000 (11:39 -0400)]
Remove logging from SlashDrawable
Test: make -j40
Change-Id: Id706c478053980ccae8be0c96d5c44602b0b9682
Guang Zhu [Tue, 23 May 2017 15:36:00 +0000 (15:36 +0000)]
Merge "Try to temporarily disable RetailDemoModeServiceTest"
Glenn Kasten [Thu, 20 Apr 2017 21:49:16 +0000 (14:49 -0700)]
Use THREAD_GROUP_RT_APP instead of THREAD_GROUP_AUDIO_APP
Test: SimpleSynth runs without performance glitches
Bug:
33085313
Change-Id: I331d7da417ed890d1009f6f2d00c13b098d9d1ea
Geoffrey Pitsch [Thu, 11 May 2017 16:57:22 +0000 (12:57 -0400)]
Use channel warning development setting.
Defaults to enabled for debuggable builds.
Bug:
37945054
Bug:
38380608
Test: manual
Change-Id: I1b67f55d507e31349908953abbf04ac764835915
Glenn Kasten [Thu, 27 Apr 2017 22:29:23 +0000 (15:29 -0700)]
Implement get_cpuset_cores_for_policy for SP_RT_APP
Test: SimpleSynth runs without performance glitches
Bug:
33085313
Change-Id: Ib5ab51b54528dbd8a0c9a18a4619e3bd6ab35c05
Jorim Jaggi [Tue, 23 May 2017 14:05:35 +0000 (16:05 +0200)]
Fix window affecting SysUi visibility for once and all
This unforunately introduces another quasi-visibiltiy method but
I think this is the best solution, as the code is pretty clean.
Test: Navigate through, settings, make sure no flickering
Test: Launch music from notification
Test: Launch United app
Test: Go settings -> app -> settings repeadetly 100 times, make
sure light bar transition is always clean
Fixes:
38216281
Change-Id: I0b97334dea3bfef2966ad0c7dd8bbd9907f2574c
Geoffrey Pitsch [Tue, 23 May 2017 14:38:13 +0000 (14:38 +0000)]
Merge "Ignore a bunch of systemui tests until flakes are found" into oc-dev am:
c9963a2f2a
am:
e5c476ae1d
Change-Id: I0f7ed129dbcabf27ac801c274e8805415f5b4110
Geoffrey Pitsch [Tue, 23 May 2017 14:33:46 +0000 (14:33 +0000)]
Merge "Ignore a bunch of systemui tests until flakes are found" into oc-dev
am:
c9963a2f2a
Change-Id: I23f6c99125cc66923b2e46deb66b200cfe15a251
Geoffrey Pitsch [Tue, 23 May 2017 14:28:56 +0000 (14:28 +0000)]
Merge "Ignore a bunch of systemui tests until flakes are found" into oc-dev
Hugo Benichi [Tue, 23 May 2017 14:27:13 +0000 (14:27 +0000)]
Merge "Fix NetworkStatsObserversTest" am:
0dc35fa969 am:
25282c3e38 am:
814351c843
am:
ef55f6c6cf
Change-Id: Ib63c7411e28e48201217c4a164c41d4d3223ca51
Andrew Scull [Tue, 23 May 2017 14:20:24 +0000 (14:20 +0000)]
Merge commit '
61ce55899d92e786fb9595052e7dcc66e8148b4c' into manual_merge_61ce55899d92
am:
519291ff44 -s ours
Change-Id: I05bc39218c9cd4018a7e2704a666c39baae8b614
Hugo Benichi [Tue, 23 May 2017 14:18:30 +0000 (14:18 +0000)]
Merge "Fix NetworkStatsObserversTest" am:
0dc35fa969 am:
25282c3e38
am:
814351c843
Change-Id: Ice4bb8de4267cba7a15a60838e165fab5ebade72
Stan Iliev [Mon, 22 May 2017 19:02:25 +0000 (15:02 -0400)]
Fix recent apps in system UI for Skia pipeline
Enable HW Bitmaps for Skia pipelines by using a readback to
convert GraphicBuffer into a raster SkImage. Both BitmapShader
and drawing HW bitmaps into a canvas are supported.
Test: recent apps work, no memory leaks, CTS graphics and
UiRendering tests passed, HWUI unit test passed
bug:
38136140
Change-Id: I23fed5febad3b1009e0417fb7e21a347a8d11b0d
Geoffrey Pitsch [Mon, 22 May 2017 19:20:20 +0000 (15:20 -0400)]
Ignore a bunch of systemui tests until flakes are found
Test: runtest systemui
Bug:
38500852
Change-Id: I54f0e868bd9432758ff21a344631b6888bc83a4b
Andrew Scull [Tue, 23 May 2017 12:11:03 +0000 (13:11 +0100)]
Merge commit '
61ce55899d92e786fb9595052e7dcc66e8148b4c' into manual_merge_61ce55899d92
Test: Build
Change-Id: I4e5ecc3b2540f07489d3b0dbcc0626d0e5f7d3da
Hugo Benichi [Tue, 23 May 2017 11:44:33 +0000 (11:44 +0000)]
Merge "Fix NetworkStatsObserversTest" am:
0dc35fa969
am:
25282c3e38
Change-Id: I8cc0dc340d3108d74cea96487560bbc8cfa2f650
Hugo Benichi [Tue, 23 May 2017 11:37:37 +0000 (11:37 +0000)]
Merge "Fix NetworkStatsObserversTest"
am:
0dc35fa969
Change-Id: I9b4e83b4e437089ea500d82990e59558ff55e02a
Hugo Benichi [Tue, 23 May 2017 11:29:47 +0000 (11:29 +0000)]
Merge "Fix NetworkStatsObserversTest"
TreeHugger Robot [Tue, 23 May 2017 11:20:01 +0000 (11:20 +0000)]
Merge "accounts: resolve error-prone warnings"
Jorim Jaggi [Tue, 23 May 2017 11:17:32 +0000 (11:17 +0000)]
Merge "Reset Keyguard when clicking emergency call button" into oc-dev am:
ff389264d9
am:
53b96948f4
Change-Id: Id44859e9304aae7e7460bd1ebdc16b5e9c1108e7
Jorim Jaggi [Tue, 23 May 2017 11:10:57 +0000 (11:10 +0000)]
Merge "Reset Keyguard when clicking emergency call button" into oc-dev
am:
ff389264d9
Change-Id: I557863570a252fc84b76198a4acf0534a55af47c
Jorim Jaggi [Tue, 23 May 2017 11:04:21 +0000 (11:04 +0000)]
Merge "Reset Keyguard when clicking emergency call button" into oc-dev
Andrew Scull [Tue, 23 May 2017 10:47:09 +0000 (10:47 +0000)]
Merge "NetworkManagementService.java: fix error-prone warnings" am:
44b7e94a7c
am:
0ba1fa19bd
Change-Id: Ia89fdb05890d40b1299c666a4535b4e9a8640323
Andrew Scull [Tue, 23 May 2017 10:40:38 +0000 (10:40 +0000)]
Merge "NetworkManagementService.java: fix error-prone warnings"
am:
44b7e94a7c
Change-Id: I7cade535f2bca308446aa91d4368ee41b62daa9b
Treehugger Robot [Tue, 23 May 2017 10:31:57 +0000 (10:31 +0000)]
Merge "NetworkManagementService.java: fix error-prone warnings"
Pavel Grafov [Tue, 23 May 2017 10:12:42 +0000 (10:12 +0000)]
Merge "Cleanup some more DPM tests to use runAsCaller."
Carmen Jackson [Tue, 23 May 2017 09:36:55 +0000 (09:36 +0000)]
Merge "Re-run pinner service on camera app update and dex optimization." into oc-dev am:
a7e45e364c
am:
45956cfa46
Change-Id: I7d27e65dd6f5e0944bb8a0d4d06308ed821b66ae
Carmen Jackson [Tue, 23 May 2017 09:30:25 +0000 (09:30 +0000)]
Merge "Re-run pinner service on camera app update and dex optimization." into oc-dev
am:
a7e45e364c
Change-Id: Idd235d42904bb03ef38a1bb3972b9e82353bbaff
TreeHugger Robot [Tue, 23 May 2017 09:24:13 +0000 (09:24 +0000)]
Merge "Re-run pinner service on camera app update and dex optimization." into oc-dev
Stephen Chen [Tue, 23 May 2017 08:40:21 +0000 (08:40 +0000)]
Merge "Check network info for metering state on AccessPoint." into oc-dev am:
73c04555ac
am:
cc52c38073
Change-Id: Ia41a5112f1a85ab431d44240cabb40e72c56facf
Stephen Chen [Tue, 23 May 2017 08:34:22 +0000 (08:34 +0000)]
Merge "Check network info for metering state on AccessPoint." into oc-dev
am:
73c04555ac
Change-Id: I85bd2269bac0cd072d06a036e09f6aea924da6ba
TreeHugger Robot [Tue, 23 May 2017 08:29:45 +0000 (08:29 +0000)]
Merge "Check network info for metering state on AccessPoint." into oc-dev
Hugo Benichi [Tue, 23 May 2017 07:09:25 +0000 (07:09 +0000)]
Merge "Fix NetworkStatsAccessTest" am:
ec1f25a4ba am:
cdb75d321b am:
85afabc4ec
am:
e6f44606ef
Change-Id: I838ae489f7d7a287291a1fc14d9e2f816cc29d14
Hugo Benichi [Tue, 23 May 2017 07:02:54 +0000 (07:02 +0000)]
Merge "Fix NetworkStatsAccessTest" am:
ec1f25a4ba am:
cdb75d321b
am:
85afabc4ec
Change-Id: I60f9d8867655a6aa24ee192c772d4c26a96c9bcd
Hugo Benichi [Tue, 23 May 2017 06:56:48 +0000 (06:56 +0000)]
Merge "Fix NetworkStatsAccessTest" am:
ec1f25a4ba
am:
cdb75d321b
Change-Id: I5ef9861438bbe474b4e4670b8fdba4368531978d
Hugo Benichi [Tue, 23 May 2017 06:51:15 +0000 (06:51 +0000)]
Merge "Fix NetworkStatsAccessTest"
am:
ec1f25a4ba
Change-Id: If949493d9967fa723667947979262bf4f90841c2
Hugo Benichi [Tue, 23 May 2017 06:49:00 +0000 (06:49 +0000)]
Merge "NsdService: simple cleanups"
Hugo Benichi [Tue, 23 May 2017 06:43:16 +0000 (06:43 +0000)]
Merge "ConnectivityManager: simplify callback handler" am:
857e7d9c85 am:
7bce658dd6 am:
a67fb638fa
am:
a0dff338c0
Change-Id: I8d2373bfd1ae3fabab8f556d2b8c8cfa6310818c
Hugo Benichi [Tue, 23 May 2017 06:43:06 +0000 (06:43 +0000)]
Merge "Fix NetworkStatsAccessTest"
Hugo Benichi [Tue, 23 May 2017 06:37:24 +0000 (06:37 +0000)]
Merge "ConnectivityManager: simplify callback handler" am:
857e7d9c85 am:
7bce658dd6
am:
a67fb638fa
Change-Id: I3934666df4a02101351993f7f83fb0a42124a2f5
Hugo Benichi [Tue, 23 May 2017 06:30:48 +0000 (06:30 +0000)]
Merge "ConnectivityManager: simplify callback handler" am:
857e7d9c85
am:
7bce658dd6
Change-Id: Ica9d4fbb1dd0ba9da4aaea0fbc3571c3446110ef
Stephen Chen [Fri, 19 May 2017 22:55:02 +0000 (15:55 -0700)]
Check network info for metering state on AccessPoint.
This resolves bug where networks manually marked as metered by Settings
UI were not tagged with a metered friction icon in the Wi-Fi picker.
Bug:
38460378
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: I2ffe25e898ac001549e7d7492a2aa335ee415a4e
Hugo Benichi [Tue, 23 May 2017 06:24:16 +0000 (06:24 +0000)]
Merge "ConnectivityManager: simplify callback handler"
am:
857e7d9c85
Change-Id: I8d5371b69fcec3f1f625923eb65191b4c018bb00
Treehugger Robot [Tue, 23 May 2017 06:16:47 +0000 (06:16 +0000)]
Merge "ConnectivityManager: simplify callback handler"
Hugo Benichi [Tue, 23 May 2017 05:53:59 +0000 (05:53 +0000)]
Merge "NsdService: test coverage for client requests."
Tomasz Wasilczyk [Tue, 11 Apr 2017 18:06:34 +0000 (11:06 -0700)]
Fix makefile warning.
Test: it builds.
Bug: b/
37159108
Change-Id: I73c09c8eeb0bab5f506c3d81072cc80c71f63779
Merged-In: I73c09c8eeb0bab5f506c3d81072cc80c71f63779
Erik Kline [Tue, 23 May 2017 05:19:16 +0000 (05:19 +0000)]
Merge "Refactor TISM add/remove code" am:
5041bbde19 am:
c85053f7eb am:
2e33be3ca9
am:
2a508a776f
Change-Id: I8ed82272183022a0469011a1f993704ecf771e3f
Erik Kline [Tue, 23 May 2017 05:12:44 +0000 (05:12 +0000)]
Merge "Refactor TISM add/remove code" am:
5041bbde19 am:
c85053f7eb
am:
2e33be3ca9
Change-Id: Ic1bcb3ca011bdc886086f34be18409eb5b12f521
Hugo Benichi [Tue, 23 May 2017 05:03:12 +0000 (05:03 +0000)]
Merge "ConnectivityServiceTest: fix flakyness" am:
a82cac1452 am:
004f36d5bc am:
eb9d0f16aa
am:
4076528b69
Change-Id: I4225fabd1b9af92a7c688e2cfbab3b20e58c53dd
Erik Kline [Tue, 23 May 2017 05:03:05 +0000 (05:03 +0000)]
Merge "Refactor TISM add/remove code" am:
5041bbde19
am:
c85053f7eb
Change-Id: Id001b164a7eca7b4e681eefbadf4b87bb1f7dbd1
Hugo Benichi [Tue, 23 May 2017 04:56:41 +0000 (04:56 +0000)]
Merge "ConnectivityServiceTest: fix flakyness" am:
a82cac1452 am:
004f36d5bc
am:
eb9d0f16aa
Change-Id: Ic792060aafb5aa8b485054be18c3dba82bb15a3b
Erik Kline [Tue, 23 May 2017 04:56:40 +0000 (04:56 +0000)]
Merge "Refactor TISM add/remove code"
am:
5041bbde19
Change-Id: I2475a3cbff37248509e21dd058ed8f3d827fefd0
Hugo Benichi [Tue, 23 May 2017 04:49:09 +0000 (04:49 +0000)]
Merge "ConnectivityServiceTest: fix flakyness" am:
a82cac1452
am:
004f36d5bc
Change-Id: Id8468bd8e38927341cdbebe2925c0bfd4bb37c0c
Treehugger Robot [Tue, 23 May 2017 04:44:22 +0000 (04:44 +0000)]
Merge "Refactor TISM add/remove code"
Hugo Benichi [Tue, 23 May 2017 04:42:40 +0000 (04:42 +0000)]
Merge "ConnectivityServiceTest: fix flakyness"
am:
a82cac1452
Change-Id: I241192b2d9565c41f47bbe6227b50049898da679
Hugo Benichi [Tue, 23 May 2017 04:35:08 +0000 (04:35 +0000)]
Merge "ConnectivityServiceTest: fix flakyness"
Hugo Benichi [Tue, 23 May 2017 03:55:22 +0000 (03:55 +0000)]
Merge "Merge "Merge "ConnectivityManager: improve argument validation" am:
cdfd3a186f am:
0187514f74" into nyc-mr2-dev-plus-aosp am:
7ee4542d17" into oc-dev-plus-aosp
am:
8e2d529c6f
Change-Id: I4e13615ae95c363a3f5d65c08998760da480c110
Hugo Benichi [Tue, 11 Apr 2017 05:42:47 +0000 (14:42 +0900)]
NsdService: simple cleanups
This patch replace some SparseArray<Integer> with SparseIntArray, and
simplify a value lookup function by using indexOfValue().
Test: TODO
Bug:
37013369,
33298084
Bug:
38503832
(cherry picked from commit
0f86b4480c8956b5c754b8e8ac0d83468af7065b)
Change-Id: Ifbe4f01bad8964e6f3a6e9633415959ab5feb0af
Hugo Benichi [Fri, 28 Apr 2017 06:31:10 +0000 (15:31 +0900)]
NsdService: test coverage for client requests.
Adding coverage for:
- NsdManager client disconnection
- in-flight request GC
Test: new test passes
Bug:
37013369,
33298084
Bug:
38503832
(cherry picked from commit
ab5bdbf84e89d48ad9daa015cae436a9d27cfdd3)
Change-Id: I02aca772d88306acae09db739ced7a2b1119b72b
OSDN Git Service
