Commit Graph

279922 Commits

Author SHA1 Message Date
Peter Qiu
28630218cc Merge "hotspot2: update PasspointConfiguration APIs" am: 59da9b24ca
am: 4ed5fe8191

Change-Id: I678ec9518c7c88acefd1bb99bcb3add27ca52b87
2017-02-01 03:24:04 +00:00
Lorenzo Colitti
10d3007e66 Merge changes If420bd66,Icbb161ca,Ida190e5a,Iae75781f am: 2ec8b8bcb6
am: 8fcc6a34f0

Change-Id: If547b83ddc48d5a0c30ad172bbb2406885d1d5ee
2017-02-01 02:50:19 +00:00
Lorenzo Colitti
67d6d41954 ConnectivityServiceTest: remove remaining poll loops. am: d2706127d0
am: 54e9050710

Change-Id: I06815166fe9ab4b7d6ab580a9eda5304067f9f91
2017-02-01 02:49:23 +00:00
Lorenzo Colitti
90babed246 Remove assertEventuallyTrue as it's unnecessary. am: 30145d755c
am: 90a70cac26

Change-Id: I7f6d543a3d05b0b165adc7a7c3938c7081c3f778
2017-02-01 02:48:10 +00:00
Lorenzo Colitti
338241de94 Rename AvoidBadWifiTracker to MultinetworkPolicyTracker am: 58ebe1c6f1
am: 0bc8070fce

Change-Id: I0ff0169ebc5e53cc9f57f224225fb0c93dc241ed
2017-02-01 02:47:16 +00:00
Peter Qiu
4ed5fe8191 Merge "hotspot2: update PasspointConfiguration APIs"
am: 59da9b24ca

Change-Id: Ide7fa5aee33295bf813dd647fffcb69ce5edf9d8
2017-02-01 02:46:39 +00:00
Lorenzo Colitti
943808385a Attempt to make waitForIdleHandler reliable. am: ae3ce81cc3
am: 8780a8afeb

Change-Id: I72c03d3686858631aefdf96e13e8033f27788f8c
2017-02-01 02:45:55 +00:00
Lorenzo Colitti
8fcc6a34f0 Merge changes If420bd66,Icbb161ca,Ida190e5a,Iae75781f
am: 2ec8b8bcb6

Change-Id: I2dd27a886aabfe0b4733ee9559886f917ccd921e
2017-02-01 02:39:35 +00:00
Lorenzo Colitti
54e9050710 ConnectivityServiceTest: remove remaining poll loops.
am: d2706127d0

Change-Id: I675096683c8ed4bc0e540491c0ff6aa828114313
2017-02-01 02:39:30 +00:00
Lorenzo Colitti
90a70cac26 Remove assertEventuallyTrue as it's unnecessary.
am: 30145d755c

Change-Id: Id574b27b40e35fbccac49910867e9735c03118d4
2017-02-01 02:38:30 +00:00
Lorenzo Colitti
0bc8070fce Rename AvoidBadWifiTracker to MultinetworkPolicyTracker
am: 58ebe1c6f1

Change-Id: I7615c9128deed7011eb9ab6f2efdcfe2e237a1a5
2017-02-01 02:37:31 +00:00
Lorenzo Colitti
8780a8afeb Attempt to make waitForIdleHandler reliable.
am: ae3ce81cc3

Change-Id: Id7e23c3a2c885ff239efa577a8d366d3df6ca9a2
2017-02-01 02:36:22 +00:00
Treehugger Robot
59da9b24ca Merge "hotspot2: update PasspointConfiguration APIs" 2017-02-01 02:35:20 +00:00
Lorenzo Colitti
2ec8b8bcb6 Merge changes If420bd66,Icbb161ca,Ida190e5a,Iae75781f
* changes:
  ConnectivityServiceTest: remove remaining poll loops.
  Remove assertEventuallyTrue as it's unnecessary.
  Rename AvoidBadWifiTracker to MultinetworkPolicyTracker
  Attempt to make waitForIdleHandler reliable.
2017-02-01 02:25:43 +00:00
Jeremy Joslin
31669e8924 Merge "Post runnables instead of sending messages." am: 71317f4a6c
am: 71a4792147

Change-Id: Idff8f071f316942e8b520c913e96d3eb8b44227d
2017-02-01 01:40:58 +00:00
Jeremy Joslin
71a4792147 Merge "Post runnables instead of sending messages."
am: 71317f4a6c

Change-Id: I13cb1fd38262f869b99245678c89f45b834210c8
2017-02-01 01:34:16 +00:00
Treehugger Robot
71317f4a6c Merge "Post runnables instead of sending messages." 2017-02-01 01:26:05 +00:00
Peter Qiu
aef5b6095f hotspot2: update PasspointConfiguration APIs
Based on the API guideline, use of public variables are discouraged.
So update PasspointConfiguration and its associated classes to use
private variables with public accessor methods.

While there, cleanup unit tests to reduce code duplications.

Bug: 34627062
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I6ea45bbcf03aec01c187425a66094fad6098d75d
2017-01-31 13:26:36 -08:00
Ying Wai (Daniel) Fan
d4d476943f Correct the formula of battery capacity estimation.
am: c800ddc824

Change-Id: Idf0396fdac7e0cedbac39da98b2fe97e26dce64e
2017-01-31 20:53:27 +00:00
Jeremy Joslin
c695a17421 Post runnables instead of sending messages.
Gaining access to a Handler's Looper can be problematic in custom
Handler implementations. Instead of creating a new internal Handler
to dispatch the method calls on we simply post Runnables to the
given Handler.

Test: adb shell am instrument -e class android.net.NetworkRecommendationProviderTest -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Bug: 34845471
Change-Id: I6fe380a92aebd630781abe5853f94737bcfeaa5f
2017-01-31 11:51:25 -08:00
Yong Shi
950c564646 Merge "Two digit call support for Claro" am: c74d60a69e
am: 7f8a08a772

Change-Id: I294b83c86708708f95352bb019a032fabc1c4ed5
2017-01-31 19:47:01 +00:00
Yong Shi
7f8a08a772 Merge "Two digit call support for Claro"
am: c74d60a69e

Change-Id: I18548618853aa37f43114ed7ffdca73c1fc0effc
2017-01-31 19:42:26 +00:00
Treehugger Robot
c74d60a69e Merge "Two digit call support for Claro" 2017-01-31 19:30:23 +00:00
Pavlin Radoslavov
91707989c4 Merge "Update the A2DP Codec Config API" am: ccd60f7cbe
am: f0096fb868

Change-Id: Ibc7d4b500adc4451978f366557b93dc6b6d3da63
2017-01-31 19:13:05 +00:00
Pavlin Radoslavov
f0096fb868 Merge "Update the A2DP Codec Config API"
am: ccd60f7cbe

Change-Id: Idc54b85eb096ec0116395332c7bc0b543a59a7d5
2017-01-31 19:07:58 +00:00
Pavlin Radoslavov
ccd60f7cbe Merge "Update the A2DP Codec Config API" 2017-01-31 19:02:36 +00:00
Pavlin Radoslavov
b37f181c98 Update the A2DP Codec Config API
Previously, the JNI upcall would contain only the current codec config.
In the new API, the upcall contains:
 1. The current codec config
 2. The list of codecs containing the local codecs capabilities
 3. The list of codecs containing the selectable codecs capabilities.
    This list is the intersection of the local codecs capabilities
    and the capabilities of the paired device.

Also, refactored the Java internals to accomodate the extra information:
 * Added new class BluetoothCodecStatus that contains the extra info:
   current codec config, local codecs capabilities and selectable
   codecs capabilities
 * Renamed method getCodecConfig() to getCodecStatus() and return the
   corresponding BluetoothCodecStatus object.
 * Updates to class BluetoothCodecConfig:
   new methods isValid(), getCodecName(), and updated toString()
   so it is more user friendly
 * Removed BluetoothCodecConfig.EXTRA_CODEC_CONFIG and
   EXTRA_PREVIOUS_CODEC_CONFIG.
   The former is superseded by BluetoothCodecStatus.EXTRA_CODEC_STATUS;
   the latter is not really used.

Test: A2DP streaming with headsets and switching the codecs
Change-Id: Ia1af2c22e521e863e28a360610aca49f7e62d31b
2017-01-31 18:58:27 +00:00
Peter Qiu
77095c33d3 Merge "hotspot2: enclose conditional statement in parenthesis" am: 161ac8b006
am: ea14632665

Change-Id: I5511f4d323761edf5eab149894a7a1b2acee4e07
2017-01-31 18:25:48 +00:00
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
Lorenzo Colitti
d2706127d0 ConnectivityServiceTest: remove remaining poll loops.
All the tests are now asynchronous. The only remaining uses of
Thread.sleep() are in the tests that check for NetworkRequest
timeouts.

Test: ConnectivityServiceTest passes 100 times in a row
Bug: 32561414
Change-Id: If420bd66c692a90d5031ee06a888a8cc3b4398a8
2017-01-31 15:44:23 +09:00
Lorenzo Colitti
30145d755c Remove assertEventuallyTrue as it's unnecessary.
The calls in testAvoidBadWifi are no longer necessary now that
waitForIdle is reliable, and the calls in testPacketKeepalives
are replaced with a wait for the NetworkAgent to disconnect.

Test: ConnectivityServiceTest passes 100 times in a row.
Bug: 32561414
Change-Id: Icbb161ca6e343bd14764a1c9ccfdd14b6cd6803f
2017-01-31 15:42:58 +09:00
Lorenzo Colitti
58ebe1c6f1 Rename AvoidBadWifiTracker to MultinetworkPolicyTracker
Rename the class and ensure that all code related to bad wifi
avoidance has names that reflect its purpose.  This will allow us
to reuse most of the the code for other purposes in future CLs.

Test: runtest frameworks-net passes
Bug: 34630278
Change-Id: Ida190e5a79e7a12f4eec07e1a3e4d9d138e83bcd
2017-01-31 15:42:57 +09:00
Lorenzo Colitti
ae3ce81cc3 Attempt to make waitForIdleHandler reliable.
The current implementation of IdleableHandlerThread is based on
the assumption that MessageQueue#isIdle will return true iff the
message loop has finished processing its messages.

Unfortunately, this is incorrect: isIdle returns true iff are no
more messages waiting in the queue; thus, it will also return
true while it is processing the last message before going idle.

Instead of using idle handlers, take the simpler approach of
posting a runnable to the message loop and waiting for it to
be processed.

Test: see other CLs in this patch series
Bug: 31479480
Change-Id: Iae75781f067b762c8653a488a5e4d5ee0c789e01
2017-01-31 15:42:17 +09:00
Hugo Benichi
811f6c86da Merge "ApfTest: fix flaky testApfFilterRa." am: c2e8588396
am: 60e1375f79

Change-Id: Ied249e20ffc80728d20ac1e5442d45f5cb767776
2017-01-31 06:07:08 +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
3e8f90a62b Merge "[AWARE] Minor hardening of manager." am: d0f1c9d1d3
am: 155d9ba6fc

Change-Id: I222a30730ec6199a53c91fb6c3fd4b96846ac7d3
2017-01-31 01:36:18 +00: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
5445bdda28 Merge changes I8eca5f24,I9d79c67c am: 54604d9143
am: 276672d192

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

Change-Id: Iabb4c7d6c120bb3b45703de084dc52ed958e1dba
2017-01-31 00:59:21 +00:00
Jerry Zhang
9877c70d9d Only send usb disconnect intents after boot. am: c1bc0a844d
am: dc9c094deb

Change-Id: Icfadbbe67ef80977500916bcb84f0c7989941b7c
2017-01-31 00:58:14 +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