OSDN Git Service
Hugo Benichi [Thu, 11 May 2017 13:56:22 +0000 (13:56 +0000)]
Merge changes Ie762ce75,I611fd791 am:
21a57f263f
am:
cc9f695ba0
Change-Id: I39dbc3c3c7e69e87e12977fb173379e60c74a3d9
Hugo Benichi [Thu, 11 May 2017 12:43:42 +0000 (12:43 +0000)]
Merge changes Ie762ce75,I611fd791
am:
21a57f263f
Change-Id: Ibb291720f6c257a8ead2c039f584f4b3ecc69be5
Hugo Benichi [Thu, 11 May 2017 12:31:39 +0000 (12:31 +0000)]
Merge changes Ie762ce75,I611fd791
* changes:
ConnectivityManager: unit test for argument validation
ConnectivityManager: uses service error codes and exceptions
Nicolas Geoffray [Thu, 11 May 2017 10:10:20 +0000 (10:10 +0000)]
Merge "Remove obsolete DEXOPT_SAFEMODE." am:
383b2af3ec
am:
10085b3737
Change-Id: Id05d1cd2d9cb6bd1b9d80b2128b45c4a411951a3
Nicolas Geoffray [Thu, 11 May 2017 09:59:49 +0000 (09:59 +0000)]
Merge "Remove obsolete DEXOPT_SAFEMODE."
am:
383b2af3ec
Change-Id: I97ccd9f087366d93495e3aeb8b26780039fd417b
Nicolas Geoffray [Thu, 11 May 2017 09:42:23 +0000 (09:42 +0000)]
Merge "Remove obsolete DEXOPT_SAFEMODE."
Hugo Benichi [Tue, 9 May 2017 05:09:02 +0000 (14:09 +0900)]
ConnectivityManager: unit test for argument validation
Bug:
36701874,
37107940
Test: new test passes
Change-Id: Ie762ce758b3d94052b7438a67fc55bef4690cbbb
Hugo Benichi [Thu, 11 May 2017 04:16:17 +0000 (13:16 +0900)]
ConnectivityManager: uses service error codes and exceptions
This patch introduces between ConnectivityManager and
ConnectivityService a mechanism for propagating back to clients
informative errors in the form of error codes and associated custom
runtime exceptions.
Without error code, the service can only throw a limited number of
different exceptions over Binder. Furthermore the throw site stack
traces are always loss. Although for individual instances of a throw,
the error message can be inspected, aggregations of stack traces from
app crashes sanitize error messages and only leaves the stack traces.
This makes debugging dificult for some service calls such as
requestNetwork that can have a variety of failure modes.
In this patch only one failure mode is codified. More can be added later
at a light cost by: 1) defining an error code, 2) defining an
associated exception, 3) mapping the code to the exception. This patch
can serves as a template for doing so.
Test: $ runtest frameworks-net,
#testNetworkRequestMaximum() detects the new exception type.
Bug:
36556809,
36701874
Change-Id: I611fd7915575c9e418f7149fcdc8a879d2a3716d
Andre Eisenbach [Thu, 11 May 2017 01:10:49 +0000 (01:10 +0000)]
Merge "Bluetooth: HID: Add support for Set Idle and Get Idle Commands (3/4)" am:
51876abe82
am:
9413fd9e1f
Change-Id: If065f6d25da71238b3788af0ee0854321a905e47
Andre Eisenbach [Thu, 11 May 2017 00:43:49 +0000 (00:43 +0000)]
Merge "Bluetooth: HID: Add support for Set Idle and Get Idle Commands (3/4)"
am:
51876abe82
Change-Id: Ia3242c0c2d7111b356c3ad2c70e8b1bea4572e9a
Andre Eisenbach [Thu, 11 May 2017 00:37:42 +0000 (00:37 +0000)]
Merge "Bluetooth: HID: Add support for Set Idle and Get Idle Commands (3/4)"
Android Build Merger (Role) [Thu, 11 May 2017 00:03:20 +0000 (00:03 +0000)]
Merge "Merge "Notify ImsService Status Correctly" am:
1bb9181380 am:
6d249dc08c" into nyc-mr2-dev-plus-aosp
Brad Ebinger [Thu, 11 May 2017 00:01:43 +0000 (00:01 +0000)]
Merge "Notify ImsService Status Correctly" am:
1bb9181380
am:
6d249dc08c
Change-Id: I1ad0e6187f2b3de1f32b0391ce97447a831874b3
Brad Ebinger [Wed, 10 May 2017 23:55:18 +0000 (23:55 +0000)]
Merge "Notify ImsService Status Correctly" am:
1bb9181380
am:
6d249dc08c
Change-Id: I5cd0317376fcf915c777ed56da9e856d72272b41
Brad Ebinger [Wed, 10 May 2017 23:48:12 +0000 (23:48 +0000)]
Merge "Notify ImsService Status Correctly"
am:
1bb9181380
Change-Id: I694072b5125151cd1db6b88774c09126199e7cc0
Brad Ebinger [Wed, 10 May 2017 23:00:52 +0000 (23:00 +0000)]
Merge "Notify ImsService Status Correctly"
Stanley Tng [Wed, 10 May 2017 22:04:24 +0000 (22:04 +0000)]
Merge "Add Save and Restore of BluetoothOn setting" am:
bbcc641317
am:
1755a4af45
Change-Id: I6a143760d9acef0fb5f28680ca1538e346ebd81f
Stanley Tng [Wed, 10 May 2017 21:17:44 +0000 (21:17 +0000)]
Merge "Add Save and Restore of BluetoothOn setting"
am:
bbcc641317
Change-Id: Ie967141aa0d8f43750f84fdd6071c26e0a26958a
Treehugger Robot [Wed, 10 May 2017 20:44:33 +0000 (20:44 +0000)]
Merge "Add Save and Restore of BluetoothOn setting"
Hall Liu [Wed, 10 May 2017 18:31:12 +0000 (18:31 +0000)]
Merge "Increase limit of locale pairs" am:
aa9a59ab32
am:
22ff1759d2
Change-Id: Ib993597558b13e9879dc56014af8529aa84c4480
Robert Greenwalt [Wed, 10 May 2017 17:35:34 +0000 (17:35 +0000)]
Merge "Update startStreaming to return status code" am:
6476ceeaee
am:
a89cacebfb
Change-Id: Ief49d5e046bc9a3396f16ec81a2196a2c3b9557b
Hall Liu [Wed, 10 May 2017 17:15:31 +0000 (17:15 +0000)]
Merge "Increase limit of locale pairs"
am:
aa9a59ab32
Change-Id: I4f9d25169bbd7e53c5396e944613e8c15fe4e308
Robert Greenwalt [Wed, 10 May 2017 17:11:12 +0000 (17:11 +0000)]
Merge "Update startStreaming to return status code"
am:
6476ceeaee
Change-Id: I92f8fad5bff456b158ba2afd55c3065678b0d5cf
Hall Liu [Wed, 10 May 2017 16:46:18 +0000 (16:46 +0000)]
Merge "Increase limit of locale pairs"
Treehugger Robot [Wed, 10 May 2017 16:46:12 +0000 (16:46 +0000)]
Merge "Update startStreaming to return status code"
Brad Ebinger [Sat, 6 May 2017 00:43:41 +0000 (17:43 -0700)]
Notify ImsService Status Correctly
Modifies ImsService to allow multiple status callbacks in
for one ImsFeature. This better handles one ImsFeature
for normal/emergency calling.
Bug:
38001858
Test: Unit Testing
Merged-In: I70ae6f5349aef75aa86d54fe37a3c32459ea3afa
Change-Id: I70ae6f5349aef75aa86d54fe37a3c32459ea3afa
Stanley Tng [Tue, 2 May 2017 04:27:31 +0000 (21:27 -0700)]
Add Save and Restore of BluetoothOn setting
This change will automatically save the Bluetooth On setting when
the user chooses to backup the phone settings into the cloud. This
setting is restored by the Setup Wizard (SUW) when configuring the
phone and this change will enable or disable the Bluetooth based
on this restored setting.
Bug:
35657817
Test: Manual test with Sailfish
Change-Id: Ie4518593af63f96f8c363f98941ca5260a3ec4bb
Hemant Gupta [Tue, 30 Jul 2013 10:39:20 +0000 (16:09 +0530)]
Bluetooth: HID: Add support for Set Idle and Get Idle Commands (3/4)
Provides an interface for application to send Set Idle
and Get Idle commands to remote HID Device. Support for these
two commands was missing from existing code, so existing code
design is reused to add support for these two commands.
Without this support following mandatory PTS test cases for HID 1.0
cannot be passed, TC_HOS_HID_BV_05/06.
Test: Executed PTS tests TC_HOS_HID_BV_05/06 and confirmed if they can
pass
Bug:
34344715
Change-Id: I548362cc328498920b2dae740f1a76b2cc2d6a67
Nicolas Geoffray [Fri, 5 May 2017 13:30:02 +0000 (14:30 +0100)]
Remove obsolete DEXOPT_SAFEMODE.
PackageManager side of the change.
bug:
37929796
Test: build
(cherry picked from commit
56123bacff220e6ac77a1179197578d3a62ecdd2)
Change-Id: I3a789d49121ca383f7931f3803b6140be456340f
Android Build Merger (Role) [Wed, 10 May 2017 12:04:00 +0000 (12:04 +0000)]
Merge "Merge "Statically include android.test.runner classes in legacy-android-test" am:
9588b607f0 am:
e73cd1f690" into nyc-mr2-dev-plus-aosp
Paul Duffin [Wed, 10 May 2017 11:59:02 +0000 (11:59 +0000)]
Merge "Statically include android.test.runner classes in legacy-android-test" am:
9588b607f0
am:
e73cd1f690
Change-Id: I99ceef172af0eb3b302178928a642baace891a2f
Paul Duffin [Wed, 10 May 2017 11:48:42 +0000 (11:48 +0000)]
Merge "Statically include android.test.runner classes in legacy-android-test" am:
9588b607f0
am:
e73cd1f690
Change-Id: Ie5b48e17c3b4f6fb4ec7c28e9d3188e233ec1794
Paul Duffin [Wed, 10 May 2017 11:30:14 +0000 (11:30 +0000)]
Merge "Statically include android.test.runner classes in legacy-android-test"
am:
9588b607f0
Change-Id: I17d3c541190c3301b27ee09806681615d97a6240
Paul Duffin [Wed, 10 May 2017 11:18:42 +0000 (11:18 +0000)]
Merge "Statically include android.test.runner classes in legacy-android-test"
Hugo Benichi [Wed, 10 May 2017 09:09:30 +0000 (09:09 +0000)]
Merge "NetworkStatsFactory: no double looping on stats + stacked interfaces" am:
1683224416
am:
cd6537edb5
Change-Id: If9773626fee700a5edcd97b319d9df7706656635
Hugo Benichi [Wed, 10 May 2017 09:00:39 +0000 (09:00 +0000)]
Merge "NetworkStatsFactory: no double looping on stats + stacked interfaces"
am:
1683224416
Change-Id: Id4987bc7f3cd486d0a0eeb1c2e5069076377de0a
Hugo Benichi [Wed, 10 May 2017 08:19:31 +0000 (08:19 +0000)]
Merge "NetworkStatsFactory: no double looping on stats + stacked interfaces"
Jakub Pawlowski [Wed, 10 May 2017 07:44:57 +0000 (07:44 +0000)]
Merge "Bluetooth: Fix Periodic Adv interval check" am:
cb70647418
am:
5bd173cd93
Change-Id: Ib06ab14a4625919e3091b45a78fab67dd38f8d37
Jakub Pawlowski [Wed, 10 May 2017 07:34:24 +0000 (07:34 +0000)]
Merge "Bluetooth: Fix Periodic Adv interval check"
am:
cb70647418
Change-Id: I2bd2aec1b09401ea66d8e3df5654248d676d2fb7
Jakub Pawlowski [Wed, 10 May 2017 07:23:16 +0000 (07:23 +0000)]
Merge "Bluetooth: Fix Periodic Adv interval check"
Sunny Kapdi [Fri, 5 May 2017 22:27:33 +0000 (15:27 -0700)]
Bluetooth: Fix Periodic Adv interval check
The MIN and MAX values need to be swapped else
the parameter check in setInterval would always
fail
Bug:
37579882
Change-Id: I48538c2a61be88caaf04abd94074b3d9eb6dde96
Android Build Merger (Role) [Wed, 10 May 2017 01:38:23 +0000 (01:38 +0000)]
Merge "Merge "Changes to MbmsStreamingManager for test app" am:
df57734354 am:
244912f414" into nyc-mr2-dev-plus-aosp
Hall Liu [Wed, 10 May 2017 01:36:08 +0000 (01:36 +0000)]
Merge "Changes to MbmsStreamingManager for test app" am:
df57734354
am:
244912f414
Change-Id: I50671942cf3bc05188a5ffc6a19b04aef69f2134
Hall Liu [Wed, 10 May 2017 01:20:14 +0000 (01:20 +0000)]
Merge "Changes to MbmsStreamingManager for test app" am:
df57734354
am:
244912f414
Change-Id: Ib39d79b8cc592f361f0c53a34f3acb9e39a18a61
Android Build Merger (Role) [Wed, 10 May 2017 01:09:24 +0000 (01:09 +0000)]
Merge "Merge "NsdService: more cleanups" am:
903d64634a am:
49bc06d0f9" into nyc-mr2-dev-plus-aosp
Hugo Benichi [Wed, 10 May 2017 01:06:13 +0000 (01:06 +0000)]
Merge "NsdService: more cleanups" am:
903d64634a
am:
49bc06d0f9
Change-Id: I90b39bce4e5c31d83579054e1b0c8921e9c33810
Hall Liu [Wed, 10 May 2017 01:05:26 +0000 (01:05 +0000)]
Merge "Changes to MbmsStreamingManager for test app"
am:
df57734354
Change-Id: I661e2cb4609f556d31e464d1cadff459b9b80354
Hugo Benichi [Wed, 10 May 2017 01:00:34 +0000 (01:00 +0000)]
Merge "NsdService: more cleanups" am:
903d64634a
am:
49bc06d0f9
Change-Id: I908c067fd7931058ac8f171eed96061b12f7a961
Hugo Benichi [Wed, 10 May 2017 00:53:24 +0000 (00:53 +0000)]
Merge "NsdService: more cleanups"
am:
903d64634a
Change-Id: Id61e1e2e240134c44e06bc9d78075ffcff8b5ff6
Hall Liu [Wed, 10 May 2017 00:50:47 +0000 (00:50 +0000)]
Merge "Changes to MbmsStreamingManager for test app"
Hugo Benichi [Wed, 10 May 2017 00:37:10 +0000 (00:37 +0000)]
Merge "NsdService: more cleanups"
Hugo Benichi [Wed, 10 May 2017 00:30:59 +0000 (00:30 +0000)]
Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks" am:
ba666e0621
am:
76dc14ec88
Change-Id: I64f50d63f56533264a94bf36520f6939b1e51a00
Hugo Benichi [Wed, 10 May 2017 00:23:06 +0000 (00:23 +0000)]
Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks"
am:
ba666e0621
Change-Id: I6c25c2f5f95ac2ffefe263b34e95009b9823c254
Hugo Benichi [Thu, 27 Apr 2017 05:52:53 +0000 (14:52 +0900)]
NetworkStatsFactory: no double looping on stats + stacked interfaces
This patch uses the associative structure of the stacked/base interface
collection to avoid the two nested for loops over stacked/base
interfaces and all stats entries when correcting 464xlat traffic stats.
Consequently the list of stats entries is iterated only once.
Test: runtest -x frameworks/base/../NetworkStatsFactoryTest.java
Bug:
33681750
Change-Id: I84ae997fb693b909f431764697627b9957131732
Hugo Benichi [Wed, 10 May 2017 00:07:28 +0000 (00:07 +0000)]
Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks"
Andre Eisenbach [Wed, 10 May 2017 00:04:19 +0000 (00:04 +0000)]
Merge "Bluetooth: Fix interval low/min values" am:
66deee2bd4
am:
0771cb13a2
Change-Id: I74e0987ed0b6bf17ad4ff04089d703143a512005
Andre Eisenbach [Tue, 9 May 2017 23:49:19 +0000 (23:49 +0000)]
Merge "Bluetooth: Fix interval low/min values"
am:
66deee2bd4
Change-Id: I42d9a56ca85715dae2093bada1ecadd0a4c0c74e
Andre Eisenbach [Tue, 9 May 2017 23:26:13 +0000 (23:26 +0000)]
Merge "Bluetooth: Fix interval low/min values"
Jakub Pawlowski [Tue, 9 May 2017 21:28:21 +0000 (14:28 -0700)]
Bluetooth: Fix interval low/min values
Bug:
38175945
Test: none
Change-Id: Idf487c7aafc518f2c57be78a1fa979b2c4a383d6
Android Build Merger (Role) [Tue, 9 May 2017 19:56:02 +0000 (19:56 +0000)]
Merge "Merge "Switch from libcrypto_static to libcrypto target" am:
4ad5256547 am:
44eb369c83" into nyc-mr2-dev-plus-aosp
Alex Klyubin [Tue, 9 May 2017 19:51:26 +0000 (19:51 +0000)]
Merge "Switch from libcrypto_static to libcrypto target" am:
4ad5256547
am:
44eb369c83
Change-Id: I5e499045158788cfab4eddb7bf80d39b087e8040
Android Build Merger (Role) [Tue, 9 May 2017 19:50:52 +0000 (19:50 +0000)]
Merge "Merge "Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" am:
7df4093371" into stage-aosp-master am:
7e93a915a6" into nyc-mr2-dev-plus-aosp
Ajay Panicker [Tue, 9 May 2017 19:49:14 +0000 (19:49 +0000)]
Merge "Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" am:
7df4093371" into stage-aosp-master
am:
7e93a915a6
Change-Id: Ia70f2280c410af337be5ffa59e4d442a2e073055
Android Build Merger (Role) [Tue, 9 May 2017 19:48:45 +0000 (19:48 +0000)]
Merge "Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" am:
7df4093371 am:
a3fe28806e" into nyc-mr2-dev-plus-aosp
Ajay Panicker [Tue, 9 May 2017 19:44:46 +0000 (19:44 +0000)]
Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" am:
7df4093371
am:
a3fe28806e
Change-Id: I3bf50965a2d4087604e010718c2aee0f90ef4593
Alex Klyubin [Tue, 9 May 2017 19:26:13 +0000 (19:26 +0000)]
Merge "Switch from libcrypto_static to libcrypto target"
am:
4ad5256547
Change-Id: Iba529dac6e8c3fc62e0f6a700604299fa9e1f629
Alex Klyubin [Tue, 9 May 2017 19:13:51 +0000 (19:13 +0000)]
Merge "Switch from libcrypto_static to libcrypto target"
Android Build Merger (Role) [Tue, 9 May 2017 18:54:15 +0000 (18:54 +0000)]
Merge "Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" am:
7df4093371" into stage-aosp-master
Ajay Panicker [Tue, 9 May 2017 18:50:12 +0000 (18:50 +0000)]
Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)"
am:
7df4093371
Change-Id: I6f3fa3a9f48113c20a8dc4912b782eab2c4ef39a
Ajay Panicker [Tue, 9 May 2017 18:23:43 +0000 (18:23 +0000)]
Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" am:
7df4093371
am:
a3fe28806e
Change-Id: Ice5081d34ba731026e6f3b6d9c7a0156334ec705
Ajay Panicker [Tue, 9 May 2017 18:05:55 +0000 (18:05 +0000)]
Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)"
am:
7df4093371
Change-Id: Ie6a4af6f5ac48e529aaeee34d92f893e710d8278
Treehugger Robot [Tue, 9 May 2017 17:53:17 +0000 (17:53 +0000)]
Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)"
Ajay Panicker [Tue, 2 May 2017 23:28:03 +0000 (16:28 -0700)]
Bluetooth: Move Bluetooth battery stats tracking (1/2)
Move Bluetooth battery stats tracking to AppScanStats for a more
unified tracking system.
Bug:
37720787
Test: cts-tradefed run cts-dev -m CtsIncidentHostTestCases -t com.android.server.cts.BatteryStatsValidationTest#testBleScans
Perform BLE scan and check battery stats
Change-Id: Ie6c682374e6e258c291d3a11eede649c7747ef40
Paul Duffin [Tue, 2 May 2017 12:13:13 +0000 (13:13 +0100)]
Statically include android.test.runner classes in legacy-android-test
In preparation for removing junit and android.test classes from
the Android API this change adds the android.test classes that are in
the android.test.runner library into legacy-android-test so that they
can be statically included into the application.
The junit.... classes from android.test.runner can already be
statically included from the junit library.
Bug:
30188076
Test: make checkbuild
Change-Id: Id8d32da9e46f0d9142b60ef28998b40e8d237b32
Hugo Benichi [Fri, 7 Apr 2017 06:20:56 +0000 (15:20 +0900)]
NetworkStatsFactory: fix double accounting on IPv6 only networks
For 464xlat scenarios on IPv6 networks, the clatd interface setup
introduces double counting of apps ipv4 traffic. NetworkStatsFactory was
accounting for this on the tx path, but not on the rx path. Also it did
not accounted for the 20 bytes added by the IPv6 header.
This patch subtract correctly the rx and tx traffic from the root uid on
the underlying interface, and also adds correctly the 20 bytes cost per
packet on the stacked interface for 464xlat traffic.
Test: added several new unit tests, based on synthetic data and real
data also.
Bug:
33681750
Change-Id: I2675643b220acbc6110179fa937d4c313b6f5e32
Erik Kline [Tue, 9 May 2017 10:47:03 +0000 (10:47 +0000)]
Merge "Refactor and improve logging." am:
c3d41d5093
am:
8af8235bca
Change-Id: Id583ab11513ab86f85d1c4001cf36e74fc521753
Erik Kline [Tue, 9 May 2017 10:40:29 +0000 (10:40 +0000)]
Merge "Refactor and improve logging."
am:
c3d41d5093
Change-Id: I8ef193a9ee0f5bf04ae18620c1a68228ed7ed929
Paul Duffin [Tue, 9 May 2017 10:36:03 +0000 (10:36 +0000)]
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am:
b2ac85e76d
am:
edefe593e3
Change-Id: I35a3d6230c92d892d5eb3936532929b28314273f
Treehugger Robot [Tue, 9 May 2017 10:33:50 +0000 (10:33 +0000)]
Merge "Refactor and improve logging."
Paul Duffin [Tue, 9 May 2017 10:29:59 +0000 (10:29 +0000)]
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)"
am:
b2ac85e76d
Change-Id: I2c06dbace44b4578a6cd94cb62a3ae67e558aaaa
Paul Duffin [Tue, 9 May 2017 10:23:15 +0000 (10:23 +0000)]
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)"
Erik Kline [Mon, 8 May 2017 08:56:35 +0000 (17:56 +0900)]
Refactor and improve logging.
Test: as follows
- build
- flashed
- booted
- "runtest frameworks-net" passed
- "dumpsys connectivity" shows new log output
Bug:
32163131
Bug:
36504926
Change-Id: I14d6da18660223f7cace156cb6594ee18928a7b0
Hugo Benichi [Tue, 9 May 2017 06:23:46 +0000 (06:23 +0000)]
Merge changes I4872f8ba,I92039f29,Iaad13e13 am:
767ac317e2
am:
717238a614
Change-Id: Id7ca8a16da5774a00517cfb60b877d181a358353
Hugo Benichi [Tue, 9 May 2017 06:14:47 +0000 (06:14 +0000)]
Merge changes I4872f8ba,I92039f29,Iaad13e13
am:
767ac317e2
Change-Id: Ibf618a27b2e5cfb3e8a69528dfecd275b33f0336
Hugo Benichi [Tue, 9 May 2017 06:08:18 +0000 (06:08 +0000)]
Merge changes I4872f8ba,I92039f29,Iaad13e13
* changes:
NsdService: simple cleanups
NsdService: test coverage for client requests.
NsdManager: remove duplicated argument validation
Hugo Benichi [Mon, 24 Apr 2017 07:41:03 +0000 (16:41 +0900)]
NsdService: more cleanups
This patch does some simple refactoring around management of nsd service
enabled status.
Test: TODO
Bug:
37013369,
33298084
Change-Id: If1b124459a814cd0e821f683ccd568e30a698d2e
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
Change-Id: I4872f8baa2bb2ff456c7f848d3afe2e7bcc9892e
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
Change-Id: I92039f297cf99352bbf4196797933d89c0b819ff
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
Change-Id: Iaad13e13976e9bf8f508d7188f823f8184ac414b
Yi Kong [Tue, 9 May 2017 00:34:20 +0000 (00:34 +0000)]
Merge "Remove unused lambda captures" am:
1101f45613
am:
c7ce115073
Change-Id: I284275ea9abc1eb1d6655372ddd27f9cb2eef4ab
Yi Kong [Tue, 9 May 2017 00:28:46 +0000 (00:28 +0000)]
Merge "Remove unused lambda captures"
am:
1101f45613
Change-Id: I371bd344d87a213393787a528121308c96c12d83
Yi Kong [Tue, 9 May 2017 00:19:08 +0000 (00:19 +0000)]
Merge "Remove unused lambda captures"
Robert Greenwalt [Mon, 8 May 2017 23:44:08 +0000 (16:44 -0700)]
Increase limit of locale pairs
This is just to avoid people injecting arbitrarily large
numbers here and causing crashes due to memory limitation.
Raised to a high enough level to avoid chance of hitting in practice.
Test: build
Change-Id: I1d2a245f9c391a9d6aec52bddd3dc086206d3e30
Robert Greenwalt [Mon, 8 May 2017 23:41:38 +0000 (16:41 -0700)]
Update startStreaming to return status code
The StreamingService object will be constructed by the manager code.
Test: build
Change-Id: I53e321dbae14270d0df2c81774bf7f055baf216f
Alex Klyubin [Mon, 8 May 2017 21:09:03 +0000 (14:09 -0700)]
Switch from libcrypto_static to libcrypto target
libcrypto target offers the same static library as libcrypto_static.
Thus, there's no need to use libcrypto_static.
Test: make pbkdf2gen
Run pbkdf2gen with and without a password and confirm it works
Bug:
26160319
Change-Id: I89a60b7521e6c3df91421d0edf64a71b8b2c20e0
Sergey Prigogin [Mon, 8 May 2017 21:12:37 +0000 (21:12 +0000)]
Merge "Fix a NPE with outlineProvider="none"" am:
46a4fbb2e4
am:
65d65ec14b
Change-Id: Iae0cc89cea82009620a75ac03de86a72ea20f1bb
Julius D'souza [Mon, 8 May 2017 21:05:10 +0000 (21:05 +0000)]
DO NOT MERGE: Add light sample filtering logic for devices with ambient light sensors that can be regularly obstructed. am:
5b8250964b
am:
cc1435b7f3
Change-Id: If4b375aef8d90641d942b6e1e73d73cfcea6dc17
Sergey Prigogin [Mon, 8 May 2017 21:01:07 +0000 (21:01 +0000)]
Merge "Fix a NPE with outlineProvider="none""
am:
46a4fbb2e4
Change-Id: Ib14f6b5369d60c06a716b99dd0274872fc0d2a51
Julius D'souza [Mon, 8 May 2017 20:57:56 +0000 (20:57 +0000)]
DO NOT MERGE: Add light sample filtering logic for devices with ambient light sensors that can be regularly obstructed.
am:
5b8250964b
Change-Id: Ifbebbcba8838b83a5c2e7d6d815784733cc95618
Sergey Prigogin [Mon, 8 May 2017 20:44:11 +0000 (20:44 +0000)]
Merge "Fix a NPE with outlineProvider="none""
OSDN Git Service
