Commit Graph

277781 Commits

Author SHA1 Message Date
Peter Qiu
ea14632665 Merge "hotspot2: enclose conditional statement in parenthesis"
am: 161ac8b006

Change-Id: I2da11aee68e52f9e868ca23cbd913703ef0585e3
2017-01-31 18:21:27 +00:00
Treehugger Robot
161ac8b006 Merge "hotspot2: enclose conditional statement in parenthesis" 2017-01-31 18:12:57 +00:00
Hugo Benichi
60e1375f79 Merge "ApfTest: fix flaky testApfFilterRa."
am: c2e8588396

Change-Id: I79c3ec0ba35973cc0dd32709447b2cc30e790d08
2017-01-31 06:01:58 +00:00
Hugo Benichi
c2e8588396 Merge "ApfTest: fix flaky testApfFilterRa." 2017-01-31 05:53:52 +00:00
Hugo Benichi
4456f33a95 ApfTest: fix flaky testApfFilterRa.
testApfFilterRa is failing with probabiliy 1/10 ~ 1/15 on the following
assert: assertDrop(program, packet, lifetime/6), for lifetime values
that are multiple of 6, where 6 is the hardcoded fraction of RA lifetime
to filter in ApfFilter.java.

When the lifetime is not a multiple of 6, the remainder of 1 to 5
seconds gives enough margin so that when the APF program is simulated
the faked lifetime of the program is less than lifetime/6 away and the
packet is dropped.

However for lifetimes which are exact multiples of 6, this margin is
always 0s and that result in nondeterminism in the result. This is
consistent with the obervation that the only failed assert was for a
lifetime of 300s, the only multiple of 6.

This can be observed by detecting the age limit at which the filter
stops dropping packet oscillating between lifetime/6 and lifetime/6 + 1
for lifetimes which are multiple of 6.

This patch fixes the flakyness by freezing the flow of time in tests so
that the expected filter age threshold is consistent and stable.

Test: no failure observed in 1000 runs.
Bug: 32561414
Change-Id: I5251d047039f34b82ce8a5d20ae46563e1e0cce8
2017-01-31 11:13:44 +09:00
Peter Qiu
55078c4fa8 hotspot2: enclose conditional statement in parenthesis
Couple unit tests are failing due to conditional statements
not enclosed in the parenthesis, which causes unexpected
returned value for the equals function.  So fix it.

Bug: 34764955
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Iaf0151803cb62eb8af308e5de40558617f84cd2f
2017-01-30 17:47:53 -08:00
Etan Cohen
155d9ba6fc Merge "[AWARE] Minor hardening of manager."
am: d0f1c9d1d3

Change-Id: I182e8c10eea318cf1fd3d3fe4da3275df01f851d
2017-01-31 01:30:24 +00:00
Etan Cohen
d0f1c9d1d3 Merge "[AWARE] Minor hardening of manager." 2017-01-31 01:19:49 +00:00
Jerry Zhang
276672d192 Merge changes I8eca5f24,I9d79c67c
am: 54604d9143

Change-Id: I1e364d21949c9d4c16b14e60c630577399cdce05
2017-01-31 00:52:48 +00:00
Badhri Jagan Sridharan
061bceafee Check and send usb state broadcast when devices boots
am: af6d473ab0

Change-Id: I13b0ea530c0701fd32d50d9c145f1b0e574fc9b0
2017-01-31 00:52:43 +00:00
Jerry Zhang
dc9c094deb Only send usb disconnect intents after boot.
am: c1bc0a844d

Change-Id: Iaa8ff69de80b3efa558f82438cc6071f749a2dc8
2017-01-31 00:51:41 +00:00
Jerry Zhang
54604d9143 Merge changes I8eca5f24,I9d79c67c
* changes:
  Check and send usb state broadcast when devices boots
  Only send usb disconnect intents after boot.
2017-01-31 00:41:55 +00:00
Badhri Jagan Sridharan
af6d473ab0 Check and send usb state broadcast when devices boots
Broadcasts are not sent until BOOT_COMPLETED is received.
When the device boots with usb plugged, the UPDATE_STATE
for connted and configured would be received way before
BOOT_COMPLETED is received. Since, devices can continue
to stay in same usb configuration(set through persistent
property trigger), check and send a usb state broadcast
if needed.

BUG: 34451258
Test: Manually checked to verify the broadcasts sent.
Change-Id: I8eca5f241ad758f5c4f1afa6c9807868dfd6195a
2017-01-31 00:41:49 +00:00
Jerry Zhang
c1bc0a844d Only send usb disconnect intents after boot.
This prevents cases where the device starts up and attempts
to change the config, but intents cannot yet be sent.

A patch to resend this skipped intent is necessary to
finish fixing the bug.

Bug: 34451258
Test: Check that usb state is properly handled on boot
Change-Id: I9d79c67ce8982fd5b43fa40781b66bb9ae820694
2017-01-30 14:34:57 -08:00
Etan Cohen
275f323e86 [AWARE] Minor hardening of manager.
Callbacks are possible even if no listener was defined.
Perform a check and print error (as opposed to crashing).

Bug: 32315992
Test: unit-tests + integration tests passing
Change-Id: Ia5eb81448ace6b88abcd448e4f378da6530ac630
2017-01-30 13:09:41 -08:00
Torbjorn Eklund
e5f8e6088e Merge "SFR sims should treat Spain as roaming"
am: 06aed6950d

Change-Id: I9500a419373ad590fddc31b638e37af05ac12830
2017-01-30 20:10:23 +00:00
Treehugger Robot
06aed6950d Merge "SFR sims should treat Spain as roaming" 2017-01-30 20:03:13 +00:00
Marie Janssen
7f8d8638eb Merge "Bluetooth: add getDiscoveryEndMillis() call"
am: 1785fc4eea

Change-Id: Iecb0aaeae57b473c8679c492717fd7c6daad82ac
2017-01-30 17:51:37 +00:00
Marie Janssen
1785fc4eea Merge "Bluetooth: add getDiscoveryEndMillis() call" 2017-01-30 17:46:18 +00:00
Nicolas Geoffray
27ffe754a4 Merge "Introduce DEBUG_JAVA_DEBUGGABLE."
am: 4df43ad959

Change-Id: Iebecb5b77d07bf91820044eda8923b2b30ebfe60
2017-01-30 15:15:10 +00:00
Nicolas Geoffray
4df43ad959 Merge "Introduce DEBUG_JAVA_DEBUGGABLE." 2017-01-30 15:09:45 +00:00
Thecrazyskull
51ad0f67d2 Merge "KeySetManagerService: prevent NPE"
am: c66327149a

Change-Id: I09d6fb3e2644ab9330b10bd67c44e61a204e589b
2017-01-29 17:22:13 +00:00
Treehugger Robot
c66327149a Merge "KeySetManagerService: prevent NPE" 2017-01-29 17:14:40 +00:00
Marie Janssen
23a4833157 Bluetooth: add getDiscoveryEndMillis() call
Method to tell when the adapter finished (or will finish) being in
discovery mode.

Test: compiles and still can scan
Bug: 34395439
Change-Id: I41b48c2b934c0a1d5e1727cec08f3f762e3cb309
2017-01-27 18:48:11 -08:00
Paul Stewart
fc5430a39c Merge changes from topic 'enterprise-client-chain'
am: c71b5dab72

Change-Id: Icfae9ac89759cd4d18f63dd2da17587bb7fdf96d
2017-01-28 01:52:41 +00:00
Paul Stewart
cb79016b16 Test passing null cert/keys to WifiEnterpriseConfig
am: 88b3c589ad

Change-Id: Ia92c2ad4b7562250aa69d3e8dbb3b8d8607d4136
2017-01-28 01:46:52 +00:00
Paul Stewart
4ad314b463 Account for null client certificate
am: 1ca57a1d10

Change-Id: Id999634bb25a379a5cfdb47412323d2cc6d0cd30
2017-01-28 01:45:53 +00:00
Paul Stewart
cd463ff269 Add a client chain to WifiEnterpriseConfig
am: 291ddaef78

Change-Id: Ic8451631732bd3bfce7ff08f9f37b18745cda357
2017-01-28 01:45:05 +00:00
Treehugger Robot
c71b5dab72 Merge changes from topic 'enterprise-client-chain'
* changes:
  Test passing null cert/keys to WifiEnterpriseConfig
  Account for null client certificate
  Add a client chain to WifiEnterpriseConfig
2017-01-28 01:38:31 +00:00
Brad Ebinger
b5f2519abc Merge "Adds @hide ImsResolver API and device overlays (2/3)"
am: d063843549

Change-Id: I82a38c0cb2b7b229b96f0a617f8b7c921eb6d3a9
2017-01-27 23:03:47 +00:00
John Reck
e4c2e8f303 Merge "Fix a bunch of repeated reads of a ro.* property"
am: 4265991701

Change-Id: I996fbd1002ef788a768b575ab6d2177dc9ab5af1
2017-01-27 22:57:29 +00:00
Treehugger Robot
d063843549 Merge "Adds @hide ImsResolver API and device overlays (2/3)" 2017-01-27 22:55:16 +00:00
Treehugger Robot
4265991701 Merge "Fix a bunch of repeated reads of a ro.* property" 2017-01-27 22:49:04 +00:00
koji.x.shigehara
4710c36e8d Merge "Handles #9 as Dial number"
am: 3b24c6e1a2

Change-Id: I71b8c65b0dc1fd813f2f962074db217df429c8ef
2017-01-27 21:38:26 +00:00
Treehugger Robot
3b24c6e1a2 Merge "Handles #9 as Dial number" 2017-01-27 21:30:42 +00:00
Brad Ebinger
e6ec7d8b8f Adds @hide ImsResolver API and device overlays (2/3)
- Adds config_ims_package device overlay, which specifies the default
package name to bind to.
- Adds config_dynamic_bind_ims device overlay, which determines
whether or not the new dynamic binding system is used.
- Adds @hide TelephonyManager API to interface with the ImsResolver

Test: Manual
Merged-In: I82a41da00e6da34629a40db431f13b968dfafe2e
Change-Id: I82a41da00e6da34629a40db431f13b968dfafe2e
2017-01-27 13:09:37 -08:00
Paul Stewart
88b3c589ad Test passing null cert/keys to WifiEnterpriseConfig
Ensure that null certificates and keys don't crash.

Bug: 34765004
Test: This is a test
Change-Id: I439b4f985c1b88ad4a9b58ee6f4eb4f90bd81246
2017-01-27 12:48:55 -08:00
Paul Stewart
1ca57a1d10 Account for null client certificate
If a null certificate is passed to setClientKeyEntry() we should
not pass a non-null array with a single null element to the
setClientKeyEntryWithCertificateChain helper method.  Instead we
should pass a null array.

Cherry-pick of 410a3498ac

Bug: 34765004
Test: cts-tradefed run cts -d --module CtsNetTestCases --test android.net.wifi.cts.WifiEnterpriseConfigTest
Change-Id: I02793b4b29bc7325f98833c58bf652ba68353827
2017-01-27 12:47:20 -08:00
Tomasz Wasilczyk
e163e7b943 Merge "Use the new radio_metadata wrapper for safer memory management."
am: a9ed0b1c8b

Change-Id: I7f5391cced1db62be2d9b88823d88d2d77f8b065
2017-01-27 20:32:52 +00:00
Tomasz Wasilczyk
a9ed0b1c8b Merge "Use the new radio_metadata wrapper for safer memory management." 2017-01-27 20:26:08 +00:00
Nicolas Geoffray
347b1df988 Introduce DEBUG_JAVA_DEBUGGABLE.
For notifying ART it will run a debuggable app.

Also rename ENABLE_DEBUGGER to ENABLE_JDWP.

Test: builds and runs
bug: 28769520
Change-Id: Ic096a176edfd5bf0bbe92b8367fbaa687a07d284
2017-01-27 11:26:53 -08:00
Erik Kline
46f8abd229 Merge "Switch to listening for all network changes."
am: 085ffa76fa

Change-Id: I87157788c5c2dc1015f9518c1c443256cfd30bae
2017-01-27 19:14:39 +00:00
Treehugger Robot
085ffa76fa Merge "Switch to listening for all network changes." 2017-01-27 19:07:08 +00:00
John Reck
ed065024a5 Fix a bunch of repeated reads of a ro.* property
SystemProperties.get() is not particularly fast,
especially if a string is returned. Since ro.* values
are unable to be changed, there's no need to
continously re-query them. Cache the value at
static init time to trivially fix this.

Test: refactoring CL.
Change-Id: Iccb021d3cb2ba3a4a1d0048ddec6811bb7409eec
(cherry picked from commit aa67f684ff)
2017-01-27 11:04:39 -08:00
Shukang Zhou
b0f03a64ea Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling."
am: e924640c4b

Change-Id: I7e56dd815f5ac72b27ac6e2e2ca7614eaa648db1
2017-01-27 18:57:12 +00:00
Treehugger Robot
e924640c4b Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling." 2017-01-27 18:49:45 +00:00
Paul Stewart
291ddaef78 Add a client chain to WifiEnterpriseConfig
Add a list of supporting certificates to be presented in the process
of presenting client credentials.

Cherry-pick of e351176716

Bug: 34688653
Test: Compile, unit tests
Change-Id: I6afd8baf67312e8ddaaeefd26f30dacc51aa33bb
2017-01-27 09:46:27 -08:00
Tomasz Wasilczyk
aee690ffad Use the new radio_metadata wrapper for safer memory management.
Bug: b/34054813
Test: VTS, manual - both done in internal branch
Change-Id: I5f4962f86b7732e14c2584a562e9737c92310697
2017-01-27 09:40:35 -08:00
Lorenzo Colitti
8fea8e5bbd Merge "ConnectivityServiceTest: fix flaky tests"
am: b8bbd30203

Change-Id: I0577f6b48de8a95e7d12e58a672fb0374ced9403
2017-01-27 09:51:32 +00:00
Lorenzo Colitti
0c659d2065 Merge "ConnectivityServiceTest: remove flaky waitForIdle test."
am: be80577f5b

Change-Id: I444746af6adc7be4a3f69243379f65aadf29ea19
2017-01-27 09:47:05 +00:00