Commit graph

516 commits

Author SHA1 Message Date
Steven Moreland
726af41e68 resolve merge conflicts of dd5206c57 to oc-mr1-dev-plus-aosp
This version of configstore was removed internally.

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I589addff6aec7bb7a8a7938d75c51dcc56116a42
2017-11-02 20:59:39 +00:00
Treehugger Robot
9d4c21f9af Merge "Update makefiles after AOSP push." 2017-11-02 20:39:30 +00:00
Steven Moreland
0d6bbbcc1e Merge "Remove unnecessary Android.mk" am: 7052f3d45d
am: 6993933fc6

Change-Id: Id4f1fcb632a25a7a44b04c44eacd3f089cd1e8ca
2017-11-02 04:24:48 +00:00
Steven Moreland
822c2e1809 Remove unnecessary Android.mk
Doesn't do anything. Just when I thought I get rid of them all.

Test: none
Change-Id: Iac559e41ea5557e99490fa439af9d720e2d9075a
2017-11-01 16:44:44 -07:00
Steven Moreland
c5bc4c7cbb Update makefiles after AOSP push.
Test: none
Change-Id: If3ce74f4d2250d33820cbd864ff56bba6f9e6b67
2017-11-01 16:42:15 -07:00
Steven Moreland
116161d94e Update for Soong java makefiles. am: c3e80fa01e am: 0fff75dee1
am: 6c811964a1

Change-Id: I85ccbb4a15cd18938607f5bca4e065b9d7e0182b
2017-10-11 16:31:07 +00:00
Steven Moreland
0fff75dee1 Update for Soong java makefiles.
am: c3e80fa01e

Change-Id: Ia8835f9c95bd98a96f5fd3aff11191e7d3726fb9
2017-10-11 16:23:54 +00:00
Steven Moreland
c3e80fa01e Update for Soong java makefiles.
Test: pass
Bug: 33420795
Change-Id: Id9b1919a19b8ff682738cfb0869a479b4dbb4293
2017-10-10 23:07:20 +00:00
Steven Moreland
9a17f41f6f Merge "Update for hidl adapter module defaults." am: 988c977079 am: 861651985f
am: b53e6ad535

Change-Id: I23269fb7a9bdd352e670a80f390527d9eef31412
2017-10-04 21:51:00 +00:00
Steven Moreland
861651985f Merge "Update for hidl adapter module defaults."
am: 988c977079

Change-Id: I289818be1b30397391847ba1c532d1014fdbed27
2017-10-04 21:45:09 +00:00
Treehugger Robot
988c977079 Merge "Update for hidl adapter module defaults." 2017-10-04 21:36:25 +00:00
Chih-hung Hsieh
9890348480 Merge "Use -Werror in hardware/interfaces" am: 85bb01dd6b am: 3ed04cd35d
am: baf19e17b3

Change-Id: I8806a9887178a7f778cc556c804a5b7a05d59836
2017-10-04 21:04:44 +00:00
Chih-hung Hsieh
3ed04cd35d Merge "Use -Werror in hardware/interfaces"
am: 85bb01dd6b

Change-Id: I9169eb99a256f3a1db9e6f82e11fd96228d9558a
2017-10-04 20:40:30 +00:00
Steven Moreland
527fd76a0e Update for hidl adapter module defaults.
Test: pass
Change-Id: Idc6a943149a279bf17cfcfd0f2571473e53bbbbf
2017-10-04 12:47:03 -07:00
Chih-Hung Hsieh
3da5b01946 Use -Werror in hardware/interfaces
* Remove unused local variables.

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I48dbbf670cc9eeff2391983788983420f8547cc9
2017-10-04 11:16:31 -07:00
Roshan Pius
b537ec5d6f Merge "wifi(implementation): Increase stop timeout" into oc-mr1-dev
am: 558d53cc61

Change-Id: I806ac9ce69cada0a26e481bd121742ddbcf6f4b0
2017-10-03 23:49:11 +00:00
Roshan Pius
9bd4e6bfc7 wifi(implementation): Increase stop timeout
The current timeout of 50ms seems to be insufficient on some devices.
So, changing it to a higher value.

Bug: 66334487
Test:  Ran the VTS tests continously in a loop for 30 minutes
without failure. Previously, failure occurence was about once every
5-10 minutes.
`while adb shell /data/VtsHalWifiSupplicantV1_0TargetTest; do :;
done; adb bugreport`

Change-Id: I884de64d748b46b9710a702f3c72cc30dd51627e
2017-09-29 15:10:21 -07:00
Steven Moreland
9fdd241905 Merge "Fix typo in update makefiles." am: 9960148420 am: f07e364ce3
am: 71a193a425

Change-Id: I45ae43f07323254212532acbf0f891d11143b05f
2017-09-26 23:58:51 +00:00
Steven Moreland
f07e364ce3 Merge "Fix typo in update makefiles."
am: 9960148420

Change-Id: I949634e72f817f3a5411130e968acd8efd1d7725
2017-09-26 23:51:07 +00:00
Steven Moreland
a5299ee739 Fix typo in update makefiles.
Bug: 37518178
Test: pass
Change-Id: Ic401b3a473f15ca4c01e58b3072e19db7c31b653
2017-09-26 21:59:43 +00:00
Steven Moreland
97228c0b7d Update makefiles for hidl adapter. am: 26a0bb2762 am: 73949c1d7e
am: b94d0c7290

Change-Id: If766cffbcc003cc0cc5eb98969b924aa918fff44
2017-09-26 12:53:13 +00:00
Steven Moreland
73949c1d7e Update makefiles for hidl adapter.
am: 26a0bb2762

Change-Id: I3a811f5cd49bd4e81e8fcd5c8e88922115812539
2017-09-25 23:14:44 +00:00
Steven Moreland
26a0bb2762 Update makefiles for hidl adapter.
Bug: 37518178
Test: manual
Change-Id: I50e999907d3c64d2b039272b823971998da64d1b
2017-09-25 18:35:56 +00:00
Etan Cohen
5af3ca8853 Merge "[AWARE] Developer documentation on HAL usage" into oc-mr1-dev
am: ccf6ab6e05

Change-Id: I6e768ad167d8e1f07ed59d9301eabdbc777e78b3
2017-09-15 02:55:04 +00:00
Etan Cohen
1b60b120de [AWARE] Developer documentation on HAL usage
Add documentation specifying which HAL APIs are used by the
framework.

Bug: 65646388
Test: N/A
Change-Id: Id1407a2d206b8eab47f5753a7cc6713b9581aeff
2017-09-14 15:19:26 -07:00
Roshan Pius
d956fb10e5 Merge "wifi(implementation): Remove unnecessary local variable" into oc-mr1-dev
am: 12d6df4a2a

Change-Id: Id89af05cf256af7b4a6958c502a7f8a683901084
2017-09-05 22:53:56 +00:00
Roshan Pius
e94d036f4f Merge "wifi(implementation): Make WifiLegacyHal.stop() blocking" into oc-mr1-dev
am: ac2cd9e8ea

Change-Id: Ic20beb0fe4cd08c8e631ea170d8e6a85dbaac5ce
2017-09-05 22:53:26 +00:00
Roshan Pius
3078a4cb67 wifi(implementation): Remove unnecessary local variable
Bug: 65058323
Test: Compiles
Change-Id: Ib268234837f5b381572c8038e7900a145fb32249
2017-08-28 16:14:22 -07:00
Roshan Pius
155344b866 wifi(implementation): Make WifiLegacyHal.stop() blocking
IWifi::stop() is currently non-blocking which makes it hard for the
client to determing when the stop is fully complete. This for example
causes wificond to disable the wlan0 interface while the legacy HAL
stop is being processed. So, add a timed wait to let the legacy HAL
complete processing of the stop before we unblock the IWifi::stop()
HIDL call.

Bug: 64611487
Test: Manual tests by wifi state toggling and verifying the order of
events in logs:
08-15 19:17:53.302   796   796 I android.hardware.wifi@1.0-service:
Stopping legacy HAL
08-15 19:17:53.302   796   796 I WifiHAL : Sent msg on exit sock to
unblock poll()
08-15 19:17:53.302   796  4793 E CLD80211:
/vendor/bin/hw/android.hardware.wifi@1.0-service: Could not find group
host_logs, errno: 0 id: -2
08-15 19:17:53.302   796  4793 E CLD80211:
/vendor/bin/hw/android.hardware.wifi@1.0-service: Could not find group
fw_logs, errno: 0 id: -2
08-15 19:17:53.302   796  4793 E CLD80211:
/vendor/bin/hw/android.hardware.wifi@1.0-service: Could not find group
per_pkt_stats, errno: 0 id: -2
08-15 19:17:53.302   796  4793 E CLD80211:
/vendor/bin/hw/android.hardware.wifi@1.0-service: Could not find group
diag_events, errno: 0 id: -2
08-15 19:17:53.302   796  4793 E CLD80211:
/vendor/bin/hw/android.hardware.wifi@1.0-service: Could not find group
fatal_events, errno: 0 id: -2
08-15 19:17:53.302   796  4793 I CLD80211:
/vendor/bin/hw/android.hardware.wifi@1.0-service: Sent msg on exit sock
to unblock poll()
08-15 19:17:53.302   796  4793 I android.hardware.wifi@1.0-service:
Legacy HAL stop complete callback received
08-15 19:17:53.304   802   838 D CHRE    : @ 151.328: [Platform] wifi:
has 0, enabled 0
08-15 19:17:53.321   796  4793 I android.hardware.wifi@1.0-service:
Legacy HAL event loop terminated
08-15 19:17:53.321   796   796 I android.hardware.wifi@1.0-service:
Legacy HAL stop complete
08-15 19:17:53.522   796   796 I android.hardware.wifi@1.0-service: Wifi
HAL stopped

Test: Will send for regression tests.
Change-Id: I394c11724e9459a4b9a6b970e2bcb4e0ad65fefc
2017-08-28 12:55:07 -07:00
Etan Cohen
3718363c50 Merge "[AWARE] Fix maxNdpSessions documentation" into oc-mr1-dev
am: 5920714752

Change-Id: I891efa8137b3a69b320d65c34832d4e64530cb20
2017-08-15 23:05:09 +00:00
TreeHugger Robot
5920714752 Merge "[AWARE] Fix maxNdpSessions documentation" into oc-mr1-dev 2017-08-15 22:53:06 +00:00
Roshan Pius
0369531e0f Merge "wifi(implementation): Reduce logging severity" into oc-mr1-dev
am: c0e5e08634

Change-Id: I1603f227ab8a10268a41da51c59f0dc3cbec5634
2017-08-15 22:33:07 +00:00
Roshan Pius
d6ce826894 wifi(implementation): Reduce logging severity
IE elements should not be present in the batched scan results, but it
being there doesn't cause any problems. The IE elements will be ignored
when we send it over the HIDL interface, so reduce the log level to
prevent log spamming.

Bug: 64448186
Test: None
Change-Id: Ia0d0312a113c907bb0992bb8f41e734fe9d05114
2017-08-15 08:42:50 -07:00
Etan Cohen
36591cb5f5 [AWARE] Fix maxNdpSessions documentation
Clarify meaning of maxNdpSessions capability. Total, not per interface.

Bug: 64685830
Test: builds
Change-Id: I24fc0a97172a4ca161f432b6c5c1dc55a44dfb12
2017-08-14 14:12:11 -07:00
Steven Moreland
dfd8287506 Updating all makefiles.
Bug: 64487114
Test: none
Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Merged-In: I2fa89b6661c39859ec4fb62c4bb0a05a35e645f0
Merged-In: Ifdc3c17cb2b85c18b37dac2d03bb5c8935c23180
Change-Id: I170fa1c4fe39f8109b1670db58ef99bb11afc0be
2017-08-14 20:25:09 +00:00
Steven Moreland
4f25c2a143 Revert "Revert "Updating all makefiles.""
Relanding without automotive/vehicle/2.0+2.1 changes.

This reverts commit 1020ebedfb.

Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Change-Id: Icc49df42c2bedf443d878d5d8fbaa53441ea65db
2017-08-11 23:02:01 +00:00
Steven Moreland
ff308ea6ba Updating all makefiles.
Bug: 64487114
Test: none
Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Merged-In: I2fa89b6661c39859ec4fb62c4bb0a05a35e645f0
Change-Id: Ifdc3c17cb2b85c18b37dac2d03bb5c8935c23180
2017-08-11 22:58:47 +00:00
Steven Moreland
1020ebedfb Revert "Updating all makefiles."
This reverts commit 8ac1971678.

Reason for revert: Didn't remove automotive changes from this CL.

Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Change-Id: I1c660cffc8817ad0b33da9f6eceb3d88e7c48416
2017-08-11 22:56:56 +00:00
Steven Moreland
8ac1971678 Updating all makefiles.
Bug: 64487114
Test: none
Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Change-Id: I2fa89b6661c39859ec4fb62c4bb0a05a35e645f0
2017-08-10 22:40:04 +00:00
Tri Vo
a6969cdd68 Merge "VTS tests now static link to HAL def libs. #2" into oc-mr1-dev
am: 2883486706

Change-Id: I763622ff5280ade458da82e95df50a1b6d104f93
2017-08-10 18:08:27 +00:00
Tri Vo
2883486706 Merge "VTS tests now static link to HAL def libs. #2" into oc-mr1-dev 2017-08-10 17:45:07 +00:00
Tri Vo
0c2ce357b1 VTS tests now static link to HAL def libs. #2
And use VtsHalTargetTestDefaults.

Bug: 64040096
Test: crop out all non-affected tests from vts-hal-hidl.xml and run
vts-tradefed run commandAndExit vts-hal-hidl --skip-all-system-status-check 
--skip-preconditions
2 failures, same as without this change:
GatekeeperHidlTest.DeleteAllUsersTest
GatekeeperHidlTest.DeleteUserTest

Change-Id: I8f6995e9536a9aefe283ee3effec9f5a7f03b620
2017-08-10 17:44:57 +00:00
Steven Moreland
65de66a67e Update makefiles for vndk enabled. am: 5e59402492 am: 271d53d836
am: 148ca84740

Change-Id: I5ef3611026b9c770bf713c14b9e01899a796e61c
2017-08-09 20:36:43 +00:00
Roshan Pius
a0c51fcb66 wifi(vts): Remove a tight loop of toggling wifi state am: 0d1bb97447
am: c2fe644833

Change-Id: Ia85c1d368d1730fbbf76c37607ca01a367f101e5
2017-08-09 05:15:18 +00:00
Roshan Pius
c2fe644833 wifi(vts): Remove a tight loop of toggling wifi state
am: 0d1bb97447

Change-Id: Ib6f4e21ab0a8cf7970ea8da0990d403629d566c5
2017-08-09 05:09:17 +00:00
Roshan Pius
0f2946eb46 wifi(vts): Remove a tight loop of toggling wifi state
am: 0d1bb97447

Change-Id: Icec63b9ffd5d12003da44bdde73edde04e55f11a
2017-08-09 05:09:17 +00:00
Roshan Pius
0d1bb97447 wifi(vts): Remove a tight loop of toggling wifi state
The tight loop of HAL start/stop exposes a race condition within the HAL.
Adding a fix for preventing this race would need a fix which would be
pretty risky at this point of the release. The issue itself is unlikely
to happen in real use cases because wifi toggles (user initiated or test
scripts initiated) via framework goes through a series of processing
before it invokes the HAL start/stop.

Bug: 64195190
Test: `make vts -j30 BUILD_GOOGLE_VTS=true TARGET_PRODUCT=aosp_arm64 &&
vts-tradefed run commandAndExit vts --skip-all-system-status-check
--primary-abi-only --skip-preconditions --module VtsHalWifiV1_0Target -l
INFO`

Change-Id: I4e4d65f8b6e2e423a3a5f26e5a97a78b7e99c3e8
2017-08-09 04:58:29 +00:00
Steven Moreland
148ca84740 Update makefiles for vndk enabled. am: 5e59402492
am: 271d53d836

Change-Id: I47ffcee7c1aa9c1d7f5c3750cc93294ff740f20d
2017-08-09 00:49:32 +00:00
Steven Moreland
271d53d836 Update makefiles for vndk enabled.
am: 5e59402492

Change-Id: I08414d68d5275df82336653cb91765af7235f914
2017-08-09 00:44:39 +00:00
Roshan Pius
cf8a53de3e wifi(vts): Ignore IWifi.stop() returning ERROR_NOT_AVAILABLE am: 8c216524a3
am: aee43a0913

Change-Id: I950d0d4f934ed1ac577fcf750c1fbc7e1d6e0030
2017-08-08 17:13:24 +00:00