OSDN Git Service
George Burgess IV [Wed, 1 Feb 2017 07:27:15 +0000 (07:27 +0000)]
Merge "Fix a use-of-uninitialized-value warning" am:
53873df5fe am:
aea873ade0
am:
820768f034
Change-Id: Id9b31425cb8ba05687ff7dfa392b230865ec18e5
George Burgess IV [Wed, 1 Feb 2017 07:21:51 +0000 (07:21 +0000)]
Merge "Fix a use-of-uninitialized-value warning" am:
53873df5fe
am:
aea873ade0
Change-Id: I747d94158c8a1c77f8ae1076c93a3d22f6c22ef5
George Burgess IV [Wed, 1 Feb 2017 07:15:00 +0000 (07:15 +0000)]
Merge "Fix a use-of-uninitialized-value warning"
am:
53873df5fe
Change-Id: I102fb345244f922cb41a5ce31b2de0af8e68bf97
Treehugger Robot [Wed, 1 Feb 2017 07:09:50 +0000 (07:09 +0000)]
Merge "Fix a use-of-uninitialized-value warning"
Justin Klaassen [Wed, 1 Feb 2017 05:21:01 +0000 (05:21 +0000)]
Merge "Enable SMS in carrier demo mode" into nyc-mr2-dev
am:
42dfcc772b
Change-Id: I8d36badab79c40e5a65a88ca4ed418409cd17e24
Justin Klaassen [Wed, 1 Feb 2017 05:20:56 +0000 (05:20 +0000)]
Enable SMS in carrier demo mode
am:
f8a10959d2
Change-Id: Icc96ba3c6fafa5df0327297ed81f8c8dff8818fe
TreeHugger Robot [Wed, 1 Feb 2017 05:13:58 +0000 (05:13 +0000)]
Merge "Enable SMS in carrier demo mode" into nyc-mr2-dev
Justin Klaassen [Wed, 1 Feb 2017 03:39:57 +0000 (19:39 -0800)]
Enable SMS in carrier demo mode
Fixes:
34861667
Test: manually verified default SMS app works in carrier demo mode.
Change-Id: Ic6f1065954e5bb54c6b78b3d604811333f6863e4
Peter Qiu [Wed, 1 Feb 2017 03:37:58 +0000 (03:37 +0000)]
Merge "hotspot2: implement hashCode() for classes with equals() function" am:
2ac992fcad am:
9e7725040b
am:
ec61beaa7a
Change-Id: I26269af9bf18789ce40858df0645e17867f44469
Jeremy Joslin [Wed, 1 Feb 2017 03:32:27 +0000 (03:32 +0000)]
Merge "Print the package name and creator UID in dump()." am:
cf7f9dd6a1 am:
ba4bc08dae
am:
9c245a51f7
Change-Id: I33a60ce4525561705572ebaa0fe1851d46c24b63
Peter Qiu [Wed, 1 Feb 2017 03:30:58 +0000 (03:30 +0000)]
Merge "hotspot2: update PasspointConfiguration APIs" am:
59da9b24ca am:
4ed5fe8191
am:
28630218cc
Change-Id: I264d4664bc9e69d9c70dce7ffcf75e3ae2e2e430
Peter Qiu [Wed, 1 Feb 2017 03:30:51 +0000 (03:30 +0000)]
Merge "hotspot2: implement hashCode() for classes with equals() function" am:
2ac992fcad
am:
9e7725040b
Change-Id: I5b36bb042933a0a889b7f84281b174a7527ccaff
Jeremy Joslin [Wed, 1 Feb 2017 03:25:47 +0000 (03:25 +0000)]
Merge "Print the package name and creator UID in dump()." am:
cf7f9dd6a1
am:
ba4bc08dae
Change-Id: I3f7e2a6ecdbe04fad0358fadecdeb8341baa99eb
Peter Qiu [Wed, 1 Feb 2017 03:24:04 +0000 (03:24 +0000)]
Merge "hotspot2: update PasspointConfiguration APIs" am:
59da9b24ca
am:
4ed5fe8191
Change-Id: I678ec9518c7c88acefd1bb99bcb3add27ca52b87
Peter Qiu [Wed, 1 Feb 2017 03:19:27 +0000 (03:19 +0000)]
Merge "hotspot2: implement hashCode() for classes with equals() function"
am:
2ac992fcad
Change-Id: I15cec4598a8a97b25c6b8ce62864ccb6b240bfde
Treehugger Robot [Wed, 1 Feb 2017 03:12:12 +0000 (03:12 +0000)]
Merge "hotspot2: implement hashCode() for classes with equals() function"
Lorenzo Colitti [Wed, 1 Feb 2017 03:02:51 +0000 (03:02 +0000)]
Merge changes If420bd66,Icbb161ca,Ida190e5a,Iae75781f am:
2ec8b8bcb6 am:
8fcc6a34f0
am:
10d3007e66
Change-Id: I94fc11a6fba6a9ee47e130284c8abea64244f8a2
Lorenzo Colitti [Wed, 1 Feb 2017 03:01:52 +0000 (03:01 +0000)]
ConnectivityServiceTest: remove remaining poll loops. am:
d2706127d0 am:
54e9050710
am:
67d6d41954
Change-Id: I31681e1248721704a9b792962a2ef5955e375e93
Lorenzo Colitti [Wed, 1 Feb 2017 03:00:41 +0000 (03:00 +0000)]
Remove assertEventuallyTrue as it's unnecessary. am:
30145d755c am:
90a70cac26
am:
90babed246
Change-Id: Ib16f54aeaa783a6e26a9d80e61388cbd9ecd9bd3
Lorenzo Colitti [Wed, 1 Feb 2017 02:59:42 +0000 (02:59 +0000)]
Rename AvoidBadWifiTracker to MultinetworkPolicyTracker am:
58ebe1c6f1 am:
0bc8070fce
am:
338241de94
Change-Id: I91f1338f3488cfc60eef0c2147aa7b1d61107cdd
Lorenzo Colitti [Wed, 1 Feb 2017 02:58:24 +0000 (02:58 +0000)]
Attempt to make waitForIdleHandler reliable. am:
ae3ce81cc3 am:
8780a8afeb
am:
943808385a
Change-Id: I2369fbd693b467283232f47703fd471c8ff60c1f
Jeremy Joslin [Wed, 1 Feb 2017 02:50:25 +0000 (02:50 +0000)]
Merge "Print the package name and creator UID in dump()."
am:
cf7f9dd6a1
Change-Id: Ifd7812ff0acba03544a05a3fcea7721da8fe7d0f
Lorenzo Colitti [Wed, 1 Feb 2017 02:50:19 +0000 (02:50 +0000)]
Merge changes If420bd66,Icbb161ca,Ida190e5a,Iae75781f am:
2ec8b8bcb6
am:
8fcc6a34f0
Change-Id: If547b83ddc48d5a0c30ad172bbb2406885d1d5ee
Lorenzo Colitti [Wed, 1 Feb 2017 02:49:23 +0000 (02:49 +0000)]
ConnectivityServiceTest: remove remaining poll loops. am:
d2706127d0
am:
54e9050710
Change-Id: I06815166fe9ab4b7d6ab580a9eda5304067f9f91
Lorenzo Colitti [Wed, 1 Feb 2017 02:48:10 +0000 (02:48 +0000)]
Remove assertEventuallyTrue as it's unnecessary. am:
30145d755c
am:
90a70cac26
Change-Id: I7f6d543a3d05b0b165adc7a7c3938c7081c3f778
Lorenzo Colitti [Wed, 1 Feb 2017 02:47:16 +0000 (02:47 +0000)]
Rename AvoidBadWifiTracker to MultinetworkPolicyTracker am:
58ebe1c6f1
am:
0bc8070fce
Change-Id: I0ff0169ebc5e53cc9f57f224225fb0c93dc241ed
Peter Qiu [Wed, 1 Feb 2017 02:46:39 +0000 (02:46 +0000)]
Merge "hotspot2: update PasspointConfiguration APIs"
am:
59da9b24ca
Change-Id: Ide7fa5aee33295bf813dd647fffcb69ce5edf9d8
Lorenzo Colitti [Wed, 1 Feb 2017 02:45:55 +0000 (02:45 +0000)]
Attempt to make waitForIdleHandler reliable. am:
ae3ce81cc3
am:
8780a8afeb
Change-Id: I72c03d3686858631aefdf96e13e8033f27788f8c
Treehugger Robot [Wed, 1 Feb 2017 02:40:59 +0000 (02:40 +0000)]
Merge "Print the package name and creator UID in dump()."
Lorenzo Colitti [Wed, 1 Feb 2017 02:39:35 +0000 (02:39 +0000)]
Merge changes If420bd66,Icbb161ca,Ida190e5a,Iae75781f
am:
2ec8b8bcb6
Change-Id: I2dd27a886aabfe0b4733ee9559886f917ccd921e
Lorenzo Colitti [Wed, 1 Feb 2017 02:39:30 +0000 (02:39 +0000)]
ConnectivityServiceTest: remove remaining poll loops.
am:
d2706127d0
Change-Id: I675096683c8ed4bc0e540491c0ff6aa828114313
Lorenzo Colitti [Wed, 1 Feb 2017 02:38:30 +0000 (02:38 +0000)]
Remove assertEventuallyTrue as it's unnecessary.
am:
30145d755c
Change-Id: Id574b27b40e35fbccac49910867e9735c03118d4
Lorenzo Colitti [Wed, 1 Feb 2017 02:37:31 +0000 (02:37 +0000)]
Rename AvoidBadWifiTracker to MultinetworkPolicyTracker
am:
58ebe1c6f1
Change-Id: I7615c9128deed7011eb9ab6f2efdcfe2e237a1a5
Lorenzo Colitti [Wed, 1 Feb 2017 02:36:22 +0000 (02:36 +0000)]
Attempt to make waitForIdleHandler reliable.
am:
ae3ce81cc3
Change-Id: Id7e23c3a2c885ff239efa577a8d366d3df6ca9a2
Treehugger Robot [Wed, 1 Feb 2017 02:35:19 +0000 (02:35 +0000)]
Merge "hotspot2: update PasspointConfiguration APIs"
Lorenzo Colitti [Wed, 1 Feb 2017 02:25:42 +0000 (02:25 +0000)]
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.
Jeremy Joslin [Wed, 1 Feb 2017 01:48:05 +0000 (01:48 +0000)]
Merge "Post runnables instead of sending messages." am:
71317f4a6c am:
71a4792147
am:
31669e8924
Change-Id: Ia7937ea6d29924e1b717430e8330d81e3f7ee9e3
Jeremy Joslin [Wed, 1 Feb 2017 01:40:58 +0000 (01:40 +0000)]
Merge "Post runnables instead of sending messages." am:
71317f4a6c
am:
71a4792147
Change-Id: Idff8f071f316942e8b520c913e96d3eb8b44227d
Jeremy Joslin [Wed, 1 Feb 2017 01:34:16 +0000 (01:34 +0000)]
Merge "Post runnables instead of sending messages."
am:
71317f4a6c
Change-Id: I13cb1fd38262f869b99245678c89f45b834210c8
Treehugger Robot [Wed, 1 Feb 2017 01:26:04 +0000 (01:26 +0000)]
Merge "Post runnables instead of sending messages."
Selim Cinek [Wed, 1 Feb 2017 01:02:07 +0000 (01:02 +0000)]
Merge "Fixed an issue where heads-upped notifications would stay" into nyc-mr2-dev
am:
e89a950b8b
Change-Id: Ic671da92251b3058e8f13395bebf7a44f3dc0cc3
Selim Cinek [Wed, 1 Feb 2017 01:01:59 +0000 (01:01 +0000)]
Fixed an issue where heads-upped notifications would stay
am:
23301afb8e
Change-Id: I04e8cf3ba5a0f44390c53867a43dacd22812da4e
Selim Cinek [Wed, 1 Feb 2017 00:52:08 +0000 (00:52 +0000)]
Merge "Fixed an issue where heads-upped notifications would stay" into nyc-mr2-dev
George Burgess IV [Tue, 24 Jan 2017 23:59:19 +0000 (15:59 -0800)]
Fix a use-of-uninitialized-value warning
This is the result of running ./gen after applying
I90bea0c94cf8d7f92a0d9a4db4e64e7e563bfb09.
Bug: None
Test: Still builds; warning is now gone.
Change-Id: Ibcd5e8dcec96406b529c5790ba0a2822dace25c2
Selim Cinek [Tue, 31 Jan 2017 22:37:14 +0000 (14:37 -0800)]
Fixed an issue where heads-upped notifications would stay
If a heads up notification was briefly removed right after
it was added it could linger around in systemUI until
the panel collapsed.
We need to make sure not to apply this improvement if
reordering isn't allowed, otherwise it will never time out
Test: existing tests pass
Bug:
34608075
Merged-In: I7768f6111ada30edcb997a42940e5e336efe1cf2
Change-Id: I7768f6111ada30edcb997a42940e5e336efe1cf2
Manu Cornet [Tue, 31 Jan 2017 23:36:52 +0000 (23:36 +0000)]
Merge "2D Recents: Keep nav bar hidden from transition thumbnail" into nyc-mr2-dev
am:
57071e8025
Change-Id: Iff6deb4ffd576de3f96de5c0762f8d692c16db8f
Manu Cornet [Tue, 31 Jan 2017 23:36:44 +0000 (23:36 +0000)]
2D Recents: Keep nav bar hidden from transition thumbnail
am:
b68b765cbf
Change-Id: I4a64e5ef354f16ba1bef1196f1a44bbffbc3c880
Manu Cornet [Tue, 31 Jan 2017 23:31:19 +0000 (23:31 +0000)]
Merge "2D recents: fix layout to show 3 tasks on a single line" into nyc-mr2-dev
am:
abfe26bad7
Change-Id: Id8714f350e775b177bffcfe8ded80a5509b213fe
Manu Cornet [Tue, 31 Jan 2017 23:31:14 +0000 (23:31 +0000)]
2D recents: fix layout to show 3 tasks on a single line
am:
776f6bacd6
Change-Id: I73cda7b837f91b78714db90c06617302201389fd
Manu Cornet [Tue, 31 Jan 2017 23:27:03 +0000 (23:27 +0000)]
Merge "2D Recents: Keep nav bar hidden from transition thumbnail" into nyc-mr2-dev
Manu Cornet [Tue, 31 Jan 2017 23:24:59 +0000 (23:24 +0000)]
Merge "2D recents: fix layout to show 3 tasks on a single line" into nyc-mr2-dev
Jeremy Joslin [Tue, 31 Jan 2017 21:48:21 +0000 (13:48 -0800)]
Print the package name and creator UID in dump().
Add a little more info to help differentiate the registered score
caches during a dump.
Test: adb shell dumpsys network_score
Change-Id: I59cb877b3237aaa85cb564795fb8a41c3d95e315
Peter Qiu [Wed, 25 Jan 2017 20:27:08 +0000 (12:27 -0800)]
hotspot2: implement hashCode() for classes with equals() function
According to API guideline, classes that override equals()
function should override hashCode() as well. Make it so.
Bug:
34198926
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I4c3afed78a2fc06cdc26dd04d076f579b3472139
Peter Qiu [Wed, 25 Jan 2017 00:01:43 +0000 (16:01 -0800)]
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
Android Build Merger (Role) [Tue, 31 Jan 2017 20:58:14 +0000 (20:58 +0000)]
Merge "Correct the formula of battery capacity estimation. am:
c800ddc824 am:
d4d476943f" into nyc-mr2-dev-plus-aosp
Ying Wai (Daniel) Fan [Tue, 31 Jan 2017 20:57:29 +0000 (20:57 +0000)]
Correct the formula of battery capacity estimation. am:
c800ddc824
am:
ac655b5a7c
Change-Id: Ifa298b57e62e4238740b177a7e4a346671d56987
Ying Wai (Daniel) Fan [Tue, 31 Jan 2017 20:57:24 +0000 (20:57 +0000)]
Correct the formula of battery capacity estimation. am:
c800ddc824
am:
d4d476943f
Change-Id: I097f2f5a610f2cef639a4c6e7e003bcbd2fd44c5
Ying Wai (Daniel) Fan [Tue, 31 Jan 2017 20:53:27 +0000 (20:53 +0000)]
Correct the formula of battery capacity estimation.
am:
c800ddc824
Change-Id: Idf0396fdac7e0cedbac39da98b2fe97e26dce64e
Ying Wai (Daniel) Fan [Tue, 31 Jan 2017 20:53:26 +0000 (20:53 +0000)]
Correct the formula of battery capacity estimation.
am:
c800ddc824
Change-Id: Ia0a16cd15fc71f6ff2af89d7ecbb7a319b5ece92
Yong Shi [Tue, 31 Jan 2017 19:51:26 +0000 (19:51 +0000)]
Merge "Two digit call support for Claro" am:
c74d60a69e am:
7f8a08a772
am:
950c564646
Change-Id: Icae8f52eb9348884b1b6b1aa1407d3d043793f3a
Jeremy Joslin [Tue, 31 Jan 2017 19:51:25 +0000 (11:51 -0800)]
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
Yong Shi [Tue, 31 Jan 2017 19:47:01 +0000 (19:47 +0000)]
Merge "Two digit call support for Claro" am:
c74d60a69e
am:
7f8a08a772
Change-Id: I294b83c86708708f95352bb019a032fabc1c4ed5
Yong Shi [Tue, 31 Jan 2017 19:42:26 +0000 (19:42 +0000)]
Merge "Two digit call support for Claro"
am:
c74d60a69e
Change-Id: I18548618853aa37f43114ed7ffdca73c1fc0effc
Treehugger Robot [Tue, 31 Jan 2017 19:30:23 +0000 (19:30 +0000)]
Merge "Two digit call support for Claro"
Pavlin Radoslavov [Tue, 31 Jan 2017 19:18:27 +0000 (19:18 +0000)]
Merge "Update the A2DP Codec Config API" am:
ccd60f7cbe am:
f0096fb868
am:
91707989c4
Change-Id: I0d58681de89b82ffdce57d3381cd2397b9ade3e7
Pavlin Radoslavov [Tue, 31 Jan 2017 19:13:05 +0000 (19:13 +0000)]
Merge "Update the A2DP Codec Config API" am:
ccd60f7cbe
am:
f0096fb868
Change-Id: Ibc7d4b500adc4451978f366557b93dc6b6d3da63
Pavlin Radoslavov [Tue, 31 Jan 2017 19:07:58 +0000 (19:07 +0000)]
Merge "Update the A2DP Codec Config API"
am:
ccd60f7cbe
Change-Id: Idc54b85eb096ec0116395332c7bc0b543a59a7d5
Pavlin Radoslavov [Tue, 31 Jan 2017 19:02:35 +0000 (19:02 +0000)]
Merge "Update the A2DP Codec Config API"
Pavlin Radoslavov [Thu, 26 Jan 2017 00:54:07 +0000 (16:54 -0800)]
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
Peter Qiu [Tue, 31 Jan 2017 18:29:49 +0000 (18:29 +0000)]
Merge "hotspot2: enclose conditional statement in parenthesis" am:
161ac8b006 am:
ea14632665
am:
77095c33d3
Change-Id: Ib0ee84bf185ac7b492029eae791436ae30c246e2
Peter Qiu [Tue, 31 Jan 2017 18:25:48 +0000 (18:25 +0000)]
Merge "hotspot2: enclose conditional statement in parenthesis" am:
161ac8b006
am:
ea14632665
Change-Id: I5511f4d323761edf5eab149894a7a1b2acee4e07
Peter Qiu [Tue, 31 Jan 2017 18:21:27 +0000 (18:21 +0000)]
Merge "hotspot2: enclose conditional statement in parenthesis"
am:
161ac8b006
Change-Id: I2da11aee68e52f9e868ca23cbd913703ef0585e3
Treehugger Robot [Tue, 31 Jan 2017 18:12:56 +0000 (18:12 +0000)]
Merge "hotspot2: enclose conditional statement in parenthesis"
Bill Yi [Tue, 31 Jan 2017 08:37:44 +0000 (08:37 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
21e0ccb1a6 -s ours
Change-Id: I12a3340aaa49277aba78c7dcc51b063458113262
Bill Yi [Tue, 31 Jan 2017 08:37:39 +0000 (08:37 +0000)]
Import translations. DO NOT MERGE
am:
652182376c -s ours
Change-Id: I45c84e6031609830111e915ab692906fc48ff0d6
TreeHugger Robot [Tue, 31 Jan 2017 08:31:11 +0000 (08:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Tue, 31 Jan 2017 07:34:40 +0000 (07:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
f3db881c0c -s ours
Change-Id: I86910f68247dbb886e7f3b4b646cf0d8fd8e686a
Bill Yi [Tue, 31 Jan 2017 07:34:33 +0000 (07:34 +0000)]
Import translations. DO NOT MERGE
am:
85f7e3989c -s ours
Change-Id: Ibcafecde0ae6b531d5e6c1f379372ad8c73e41fa
Bill Yi [Tue, 31 Jan 2017 07:33:35 +0000 (07:33 +0000)]
Import translations. DO NOT MERGE
am:
e924e16c3d -s ours
Change-Id: I90ef4192992b588b600f76c90b8744fc52eeb9e8
TreeHugger Robot [Tue, 31 Jan 2017 07:28:41 +0000 (07:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Lorenzo Colitti [Mon, 30 Jan 2017 08:45:49 +0000 (17:45 +0900)]
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
Lorenzo Colitti [Fri, 27 Jan 2017 09:46:03 +0000 (18:46 +0900)]
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
Lorenzo Colitti [Tue, 24 Jan 2017 00:41:36 +0000 (09:41 +0900)]
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
Lorenzo Colitti [Wed, 25 Jan 2017 14:09:07 +0000 (23:09 +0900)]
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
Bill Yi [Tue, 31 Jan 2017 06:39:49 +0000 (22:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0ef2e2fb59b03df8ce1c4ebb29154ef815b6154b
Auto-generated-cl: translation import
Hugo Benichi [Tue, 31 Jan 2017 06:11:35 +0000 (06:11 +0000)]
Merge "ApfTest: fix flaky testApfFilterRa." am:
c2e8588396 am:
60e1375f79
am:
811f6c86da
Change-Id: Idd738e1a4c9f0a865f5b84270535a94c492341ce
Hugo Benichi [Tue, 31 Jan 2017 06:07:08 +0000 (06:07 +0000)]
Merge "ApfTest: fix flaky testApfFilterRa." am:
c2e8588396
am:
60e1375f79
Change-Id: Ied249e20ffc80728d20ac1e5442d45f5cb767776
Hugo Benichi [Tue, 31 Jan 2017 06:01:58 +0000 (06:01 +0000)]
Merge "ApfTest: fix flaky testApfFilterRa."
am:
c2e8588396
Change-Id: I79c3ec0ba35973cc0dd32709447b2cc30e790d08
Hugo Benichi [Tue, 31 Jan 2017 05:53:51 +0000 (05:53 +0000)]
Merge "ApfTest: fix flaky testApfFilterRa."
Bill Yi [Tue, 31 Jan 2017 04:45:03 +0000 (20:45 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icf17a6fb6b941caea8a843c0cac96f0b1883d4f3
Auto-generated-cl: translation import
Bill Yi [Tue, 31 Jan 2017 04:36:40 +0000 (20:36 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ifb3e58e4528c1d7ea44bac121b7e210672aa6a7f
Auto-generated-cl: translation import
Hugo Benichi [Mon, 19 Dec 2016 05:50:52 +0000 (14:50 +0900)]
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
Peter Qiu [Tue, 31 Jan 2017 01:47:53 +0000 (17:47 -0800)]
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
Etan Cohen [Tue, 31 Jan 2017 01:40:49 +0000 (01:40 +0000)]
Merge "[AWARE] Minor hardening of manager." am:
d0f1c9d1d3 am:
155d9ba6fc
am:
3e8f90a62b
Change-Id: Ia909905095094f33c536774235d49060ca2d63c3
Etan Cohen [Tue, 31 Jan 2017 01:36:18 +0000 (01:36 +0000)]
Merge "[AWARE] Minor hardening of manager." am:
d0f1c9d1d3
am:
155d9ba6fc
Change-Id: I222a30730ec6199a53c91fb6c3fd4b96846ac7d3
Etan Cohen [Tue, 31 Jan 2017 01:30:24 +0000 (01:30 +0000)]
Merge "[AWARE] Minor hardening of manager."
am:
d0f1c9d1d3
Change-Id: I182e8c10eea318cf1fd3d3fe4da3275df01f851d
Etan Cohen [Tue, 31 Jan 2017 01:19:48 +0000 (01:19 +0000)]
Merge "[AWARE] Minor hardening of manager."
Jerry Zhang [Tue, 31 Jan 2017 01:09:09 +0000 (01:09 +0000)]
Merge changes I8eca5f24,I9d79c67c am:
54604d9143 am:
276672d192
am:
5445bdda28
Change-Id: I6f17910b547553571b3b92c60deb5ee8acf6af2a
Badhri Jagan Sridharan [Tue, 31 Jan 2017 01:08:00 +0000 (01:08 +0000)]
Check and send usb state broadcast when devices boots am:
af6d473ab0 am:
061bceafee
am:
df1df40f91
Change-Id: I28430b3de3ee91c4eb5dc4e4ef88e5924d56e2b4
Jerry Zhang [Tue, 31 Jan 2017 01:06:45 +0000 (01:06 +0000)]
Only send usb disconnect intents after boot. am:
c1bc0a844d am:
dc9c094deb
am:
9877c70d9d
Change-Id: I515745dd4f30a979fffcb6c9eea8a38e1bef11ca
OSDN Git Service
