OSDN Git Service
Branden Archer [Fri, 25 Jan 2019 04:21:28 +0000 (20:21 -0800)]
Merge "Assign a new future before calling update()" am:
ab761288e2
am:
90f296c067
Change-Id: I549f9d819b2b48dd7410a92d2d006fa3d9cc512f
Branden Archer [Fri, 25 Jan 2019 04:17:25 +0000 (20:17 -0800)]
Merge "Assign a new future before calling update()"
am:
ab761288e2
Change-Id: Iab1a8600000bf36c117b05a82ad1986cbd0f48fa
Treehugger Robot [Fri, 25 Jan 2019 04:08:10 +0000 (04:08 +0000)]
Merge "Assign a new future before calling update()"
Branden Archer [Wed, 2 Jan 2019 19:26:09 +0000 (11:26 -0800)]
Assign a new future before calling update()
An empty future was being used, and when the update() call
completed the value in the empty future was grabbed
resulting in a nullptr de-reference.
Bug:
120182820
Test: atest system/hardware/interfaces/wifi/keystore/1.0/
vts/functional/VtsHalWifiKeystoreV1_0TargetTest.cpp
Change-Id: I02968a5b93f2e59ce5801676ab3bae437e2c53d8
Tri Vo [Fri, 21 Dec 2018 23:46:15 +0000 (15:46 -0800)]
Handle /sys/power/* interfaces not being available. am:
0dbe3f326d
am:
155dc360a8
Change-Id: I6608aaa31c5e355ebad1b1b0cb35a6264cb85e98
Tri Vo [Fri, 21 Dec 2018 23:42:15 +0000 (15:42 -0800)]
Handle /sys/power/* interfaces not being available.
am:
0dbe3f326d
Change-Id: I79a9b0f0d19f185f570da2672d98456484f4630d
Tri Vo [Thu, 20 Dec 2018 20:53:04 +0000 (12:53 -0800)]
Handle /sys/power/* interfaces not being available.
If either /sys/power/wakeup_count or /sys/power/state fail to open, we
construct SystemSuspend with blocking fds. This way this process will
keep running, handle wake lock requests, collect stats, but won't
suspend the device.
We want this behavior on devices (hosts) where system suspend should not
be handles by Android platform e.g. ARC++, Android virtual devices.
Bug:
118637369
Test: Remove system.suspend access to /sys/power/{ wakeup_count state }
using SELinux. Device still boots and doesn't suspend.
Change-Id: I068a584ada6968520219ee5288f598a53aa48c68
Tri Vo [Fri, 7 Dec 2018 23:17:52 +0000 (15:17 -0800)]
system suspend: more information about wake locks am:
ba81fb29c4
am:
6cd53dfb0c
Change-Id: I450c0d4769d664fdef5ae383660db6f4497f3c84
Tri Vo [Fri, 7 Dec 2018 23:13:21 +0000 (15:13 -0800)]
system suspend: more information about wake locks
am:
ba81fb29c4
Change-Id: Ic5432dacf983860664135c1a15acf0a643e2e5a3
Tri Vo [Fri, 9 Nov 2018 02:24:52 +0000 (18:24 -0800)]
system suspend: more information about wake locks
/sys/power/{wake_lock wake_unlock} can give a list of all currently
active and inactive wake lock names. Bring system suspend debug
functionality up to par by keeping track of all used wake lock names,
client pids, current state and last used timestamp.
To prevent collected stats from growing unboundedly we evict least
recently used stats entry after a given threshold.
Bug:
78888165
Test: SystemSuspendV1_0UnitTest
Change-Id: I26eb94e61d4656ec1bba45b4a70a0715fae15d05
Janis Danisevskis [Wed, 5 Dec 2018 21:34:42 +0000 (13:34 -0800)]
Fix inverted error code. am:
25f58c7312
am:
8f12a66e75
Change-Id: I36aab81250fefd903a2b022bfcb75bc19e228ac5
Janis Danisevskis [Wed, 5 Dec 2018 21:30:44 +0000 (13:30 -0800)]
Fix inverted error code.
am:
25f58c7312
Change-Id: I01195e9e20bfb16efa959d2aaea5c50df33165dc
Janis Danisevskis [Wed, 5 Dec 2018 00:52:58 +0000 (16:52 -0800)]
Fix inverted error code.
During the Multithreaded keystore refactor the error code returned by
getKeyCharacteristics was mistakenly inverted.
Test: yes please!
Bug:
120182820
Bug:
111443219
Change-Id: I5f5c07f30e0ee264ce75a5ffd2986186b9d66ce3
Branden Archer [Wed, 5 Dec 2018 18:48:00 +0000 (10:48 -0800)]
Use stream operator to report result code am:
f98908042a
am:
f5cf23943b
Change-Id: I6e01c6fa50eb39b3f3674eda287cb070e10cfd58
Branden Archer [Wed, 5 Dec 2018 18:37:08 +0000 (10:37 -0800)]
Use stream operator to report result code
am:
f98908042a
Change-Id: I1f8934f057475608e4e8e9ecc280c9ca74be0ba9
Branden Archer [Tue, 20 Nov 2018 19:05:23 +0000 (11:05 -0800)]
Use stream operator to report result code
The cast operator for KeyStoreNativeReturnCode and
KeyStoreNativeReturnCode will be removed later.
There already exists a stream operator to get
at the underlying value. Use that instead.
Bug:
119771891
Test: Built for walleye successfully.
Change-Id: I784d3c54d7b2d612201f045fe2862cf2529f4e1f
Tri Vo [Fri, 16 Nov 2018 21:17:31 +0000 (13:17 -0800)]
Merge "Add trong@ to OWNERS for suspend HAL." am:
5ebf69e8dd
am:
8659169f45
Change-Id: Ie765c316d8b173353bc20ada5678c395f039fab4
Tri Vo [Fri, 16 Nov 2018 21:05:55 +0000 (13:05 -0800)]
Merge "Add trong@ to OWNERS for suspend HAL."
am:
5ebf69e8dd
Change-Id: Id44ec5796ce54d713d33573ddadc5e2a852699ce
Tri Vo [Fri, 16 Nov 2018 20:50:22 +0000 (20:50 +0000)]
Merge "Add trong@ to OWNERS for suspend HAL."
Janis Danisevskis [Thu, 15 Nov 2018 01:57:41 +0000 (17:57 -0800)]
Merge "Multi-threaded Keystore" am:
7d6ca3b265
am:
f4db2f14ca
Change-Id: I032441d60f79538785974e704a81c79b1d5a1027
Janis Danisevskis [Thu, 15 Nov 2018 01:45:02 +0000 (17:45 -0800)]
Merge "Multi-threaded Keystore"
am:
7d6ca3b265
Change-Id: I56b08c61180f6577530fe423a3c7e6cc2d549d58
Janis Danisevskis [Thu, 15 Nov 2018 01:19:10 +0000 (01:19 +0000)]
Merge "Multi-threaded Keystore"
Tri Vo [Wed, 14 Nov 2018 01:46:31 +0000 (17:46 -0800)]
Merge "Revert "Start suspend HAL early."" am:
86fc043885
am:
3d8ab6e73a
Change-Id: Ic32376873e558315e79053c83f195d092a1f9d82
Tri Vo [Wed, 14 Nov 2018 01:41:23 +0000 (17:41 -0800)]
Merge "Revert "Start suspend HAL early.""
am:
86fc043885
Change-Id: I683c22dcb17e785921ce595e441b35d92c12b59d
Treehugger Robot [Wed, 14 Nov 2018 01:29:48 +0000 (01:29 +0000)]
Merge "Revert "Start suspend HAL early.""
Tri Vo [Wed, 14 Nov 2018 00:09:20 +0000 (16:09 -0800)]
Add trong@ to OWNERS for suspend HAL.
Bug: n/a
Test: n/a
Change-Id: I4c763478d86c68735edbf1355a8c25a8f9e22b7d
Tri Vo [Tue, 13 Nov 2018 22:25:01 +0000 (22:25 +0000)]
Revert "Start suspend HAL early."
This reverts commit
ec7772299db6bc76f1c2aa1d471447cfddce04ae.
Fixes:
119325488
Reason for revert: regressed boot time
Change-Id: I91e2300b1f0625a5787d0af02db06b3079331787
Janis Danisevskis [Fri, 2 Nov 2018 21:51:02 +0000 (14:51 -0700)]
Multi-threaded Keystore
This patch changes the calling code in the wifi interface to use the new
asynchronous keystore api model.
Test: would be nice
Bug:
111443219
Change-Id: Iee6a6fede4670dfe503dc7b87a34b88c1c8f01f4
Janis Danisevskis [Thu, 8 Nov 2018 23:39:03 +0000 (15:39 -0800)]
Merge "Remove legacy functions form IKeystoreService.aidl" am:
a7dbd69b3e
am:
f7ddbe1390
Change-Id: If1116aa610fcf4366440272973eefbbc4fd60e54
Janis Danisevskis [Thu, 8 Nov 2018 23:23:05 +0000 (15:23 -0800)]
Merge "Remove legacy functions form IKeystoreService.aidl"
am:
a7dbd69b3e
Change-Id: Ibb821f41dca0937ebce32c1d73c57672fd2dd4dd
Treehugger Robot [Thu, 8 Nov 2018 23:01:46 +0000 (23:01 +0000)]
Merge "Remove legacy functions form IKeystoreService.aidl"
Tri Vo [Thu, 8 Nov 2018 22:55:48 +0000 (14:55 -0800)]
Start suspend HAL early. am:
ec7772299d
am:
8dd47f2e80
Change-Id: I155a4de2022c8ffe4e0d6625b77b44eb18477f2a
Tri Vo [Thu, 8 Nov 2018 22:39:09 +0000 (14:39 -0800)]
Start suspend HAL early.
am:
ec7772299d
Change-Id: I04843a7730f13a9703785eefaded5a982aab9075
Tri Vo [Thu, 8 Nov 2018 18:40:57 +0000 (10:40 -0800)]
Start suspend HAL early.
Requests to acquire wake locks are blocked on suspend HAL being started.
So ideally it should be available to the system as early as possible.
Bug:
78888165
Test: boot walleye
Change-Id: If38836ce561f06ce9d3ee3f6e03885aaccbd48c0
Janis Danisevskis [Thu, 9 Aug 2018 18:15:44 +0000 (11:15 -0700)]
Remove legacy functions form IKeystoreService.aidl
In preparation for making the keystore service asynchronous we remove
redundant legacy functionality from the protocol.
This patch removes the functions get_pubkey, sign, verify, generate,
and import_key. Which have long been superseded by exportKey
(get_pubkey), begin/update/finish (sign, verify), generateKey
(generate), and importKey (import_key).
Test: Not yet
Bug:
109769728
Change-Id: Ia59b30377684c013e9b4496ca9e365f8c2710ec1
Bill Yi [Thu, 25 Oct 2018 02:04:42 +0000 (19:04 -0700)]
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am:
cae0b889f1 -s ours
am:
76d5fba0d2 -s ours
Change-Id: Id68fd92466e2032b41e55d64aad3aecb72d8adf7
Bill Yi [Wed, 24 Oct 2018 23:38:47 +0000 (16:38 -0700)]
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am:
cae0b889f1 -s ours
Change-Id: I879c6bec4c2bfe8a300505c5b907383e7d680b59
Bill Yi [Wed, 24 Oct 2018 21:48:19 +0000 (14:48 -0700)]
Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: Iae3aab5abbf9ec60db33a9184d76210c345641ee
Bill Yi [Wed, 24 Oct 2018 17:55:20 +0000 (10:55 -0700)]
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am:
86edb72fe7 -s ours
Change-Id: I57fc667020827d996105441ea1e99e37533e00bc
Bill Yi [Wed, 24 Oct 2018 16:07:58 +0000 (09:07 -0700)]
Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
Change-Id: Ic1332b53d46886328c726d03b8206647dadd898f
Tri Vo [Sat, 20 Oct 2018 22:08:43 +0000 (15:08 -0700)]
Deploy SystemSuspendV1_0UnitTest in automated VTS runs. am:
b69833356c
am:
f10cca93d4
Change-Id: Icc90e047efbf8dcc9915b9f72b4eb12eeed1eff6
Tri Vo [Sat, 20 Oct 2018 22:04:41 +0000 (15:04 -0700)]
Deploy SystemSuspendV1_0UnitTest in automated VTS runs.
am:
b69833356c
Change-Id: Ibd49d209b1859a2d07b8032113b4706f6cf827fb
Tri Vo [Wed, 10 Oct 2018 01:24:37 +0000 (18:24 -0700)]
Deploy SystemSuspendV1_0UnitTest in automated VTS runs.
Bug:
117176837
Test: vts-tradefed run commandAndExit vts-systems
--skip-all-system-status-check --primary-abi-only --skip-preconditions
--skip-device-info --module SystemSuspendV1_0TargetUnitTest
Change-Id: Icfef15e6fbbe86f7ca2a0a7e47897f1c837e7695
Tri Vo [Thu, 11 Oct 2018 01:04:19 +0000 (18:04 -0700)]
Fix deadlock when callback modifies callback list. am:
c0578b9128
am:
23cafd74e6
Change-Id: Ic55fdb1d1c8c3c60c213c7b9d7d913a6feb9f98b
Tri Vo [Thu, 11 Oct 2018 00:58:02 +0000 (17:58 -0700)]
Fix deadlock when callback modifies callback list.
am:
c0578b9128
Change-Id: Ifa436f31dbed547f3d3df9664dd8c92ff1496f34
Tri Vo [Wed, 10 Oct 2018 22:29:48 +0000 (15:29 -0700)]
Fix deadlock when callback modifies callback list.
Bug:
117555757
Test: SystemSuspendUnitTest
Change-Id: I40e7ffcc1bbc744a5b9e6d739166f1eebb8ed151
Tri Vo [Fri, 28 Sep 2018 02:56:00 +0000 (19:56 -0700)]
Implement exponential backoff analogous to libsuspend am:
5d524a1d61
am:
2877b3fd51
Change-Id: I8ff818111917f76f6714ab37e3a0f86f93af606a
Tri Vo [Fri, 28 Sep 2018 02:51:55 +0000 (19:51 -0700)]
Implement exponential backoff analogous to libsuspend
am:
5d524a1d61
Change-Id: Ica9313242603fa9f2c8bc3ebaa0a473645ffd5dd
Tri Vo [Thu, 20 Sep 2018 23:07:23 +0000 (16:07 -0700)]
Implement exponential backoff analogous to libsuspend
Suspends attempts are not free w.r.t. power consumption. This change prevents
rapid battery drain on devices with broken system suspend (e.g. due to faulty
driver)
Originally implemented in libususpend in commit
fb896944b6a78d951c8442b444af860a28117e5c
Bug:
78888165
Test: SystemSuspendV1_0UnitTest
Test: left device overnight, ~50% fewer failed attempts to suspend with this
change vs without.
Change-Id: Icff1135b9c316fa9de1558ecea42db9ed0d10d9a
Tri Vo [Tue, 25 Sep 2018 22:03:11 +0000 (15:03 -0700)]
Passing partial vs full wake lock info for ARC++ am:
365b75f157
am:
26b41fd33f
Change-Id: I96cc30adea6e02e4f10056fe7dd5a01a01be9a6f
Tri Vo [Tue, 25 Sep 2018 21:28:46 +0000 (14:28 -0700)]
Passing partial vs full wake lock info for ARC++
am:
365b75f157
Change-Id: Ie783b4bed8cd0624d7320f79d7e043f772900618
Tri Vo [Fri, 21 Sep 2018 22:19:16 +0000 (15:19 -0700)]
Passing partial vs full wake lock info for ARC++
We pass an enum to acquireWakeLock(), symmetric to how it's done in libpower
interface.
The screen could be managed above (android) or below (ARC++) this HAL depending
on the device, so we don't mandate that full wake locks keep the screen alive.
Only requirement is that all wake locks block system suspend.
Bug:
115947180
Test: SystemSuspendV1_0UnitTest
Change-Id: I92c65371852ffb2f71f5d529b7020d256cb1ba76
Tri Vo [Mon, 10 Sep 2018 02:25:53 +0000 (19:25 -0700)]
Add ISystemSuspendCallback. am:
b53742607a
am:
5331ab6fca
Change-Id: Ib6accbeae955fe4095d6fa1f2a6ddd9a576e4256
Tri Vo [Mon, 10 Sep 2018 02:20:20 +0000 (19:20 -0700)]
Add ISystemSuspendCallback.
am:
b53742607a
Change-Id: I87cb696e83bf7d52f0a7fe35e12cf62a0c69f68f
Tri Vo [Fri, 31 Aug 2018 00:58:41 +0000 (17:58 -0700)]
Add ISystemSuspendCallback.
The callback will be used to synchronously report system suspend events.
Current usage: BatteryStatsService needs to be notified about
each system suspend attempt and whether it was successful.
Bug:
78888165
Test: SystemSuspendV1_0UnitTest
Change-Id: I234f74f6f3c35e5d6bb33ceda569e11520850ccf
Tri Vo [Thu, 6 Sep 2018 06:56:57 +0000 (23:56 -0700)]
Add IWakeLock::release() method. am:
d502490bac
am:
1f00dd48f6
Change-Id: Ie89b6df20aa02850858bbe6b16c9c51abe3990fc
Tri Vo [Thu, 6 Sep 2018 06:56:51 +0000 (23:56 -0700)]
Add debugName parameter to acquireWakeLock(). am:
a3573abb32
am:
5919e17799
Change-Id: Idb2775a76dd967e33950d05c6cfa4eafbfb70e98
Tri Vo [Thu, 6 Sep 2018 05:12:26 +0000 (22:12 -0700)]
Add IWakeLock::release() method.
am:
d502490bac
Change-Id: Id5e96044930c08c01589afdf1d213c98f39efb92
Tri Vo [Thu, 6 Sep 2018 05:12:22 +0000 (22:12 -0700)]
Add debugName parameter to acquireWakeLock().
am:
a3573abb32
Change-Id: Ic8523357af3e14f5ffa4f461cf50eb8fcb74c00e
Tri Vo [Wed, 29 Aug 2018 20:44:37 +0000 (13:44 -0700)]
Add IWakeLock::release() method.
Motivation:
-This should help migrate code that relied on old
acquire/release_wake_lock() methods to new API.
-Being able to release a lock before the end of the scope is consistent
with other "lock" constructs (e.g. unique_lock, shared_lock).
Bug:
78888165
Test: SystemSuspendV1_0UnitTest
Change-Id: Ibb654f523b9c255df68d93407b593deac006920b
Tri Vo [Tue, 28 Aug 2018 20:31:04 +0000 (13:31 -0700)]
Add debugName parameter to acquireWakeLock().
Bug:
78888165
Test: SystemSuspendV1_0UnitTest
Change-Id: Ia6570af63eb1eb01145bd7870c196a0eed91883a
Tri Vo [Fri, 17 Aug 2018 03:30:43 +0000 (20:30 -0700)]
System suspend HAL implementation. am:
180813bea6
am:
b5cfa06fbd
Change-Id: Id33e2dde5ac8b482c04608434f83f592033e3ad6
Tri Vo [Fri, 17 Aug 2018 00:40:01 +0000 (17:40 -0700)]
System suspend HAL implementation.
am:
180813bea6
Change-Id: I262ff63599f32cabbac892f799f9573c21aba1d1
Tri Vo [Thu, 16 Aug 2018 04:20:08 +0000 (21:20 -0700)]
System suspend HAL implementation.
Bug:
78888165
Test: SystemSuspendV1_0UnitTest
Change-Id: I4ba1075ce51684e431098635c72aece67351644a
Tri Vo [Wed, 15 Aug 2018 06:25:37 +0000 (23:25 -0700)]
System suspend HAL interface. am:
3b083e7c94
am:
f3aa3376af
Change-Id: I0b5a06d622f184dc91a7b1bebf57af87bc6563f4
Tri Vo [Wed, 15 Aug 2018 03:08:11 +0000 (20:08 -0700)]
System suspend HAL interface.
am:
3b083e7c94
Change-Id: I0119c0323a7fff2ed1afe0a474b2aed33c06664c
Tri Vo [Sun, 8 Apr 2018 23:59:14 +0000 (16:59 -0700)]
System suspend HAL interface.
Bug:
78888165
Test: SystemSuspendV1_0UnitTest
Change-Id: I3c3537a72dac65d316aeb77fd7b2d7cff4fb67e5
Merged-In: I3c3537a72dac65d316aeb77fd7b2d7cff4fb67e5
(cherry picked from commit
2fbf967c4f47b7f3977893fd4a2988d32eff4c27)
Xin Li [Wed, 8 Aug 2018 06:36:58 +0000 (23:36 -0700)]
Merge Android Pie into master am:
69c3fc690d am:
6c9a5982be
am:
c5b2a410ff
Change-Id: I06facdddfd59d2f129958849db44a90ce0bd8336
Xin Li [Wed, 8 Aug 2018 02:12:21 +0000 (19:12 -0700)]
Merge Android Pie into master am:
69c3fc690d
am:
6c9a5982be
Change-Id: I3e1a3ad2624dd3e052483036d5a0029561a6a4ae
Xin Li [Tue, 7 Aug 2018 22:44:00 +0000 (15:44 -0700)]
Merge Android Pie into master
am:
69c3fc690d
Change-Id: I399108f32aa466b8554b5fec1b517630b879f063
Xin Li [Mon, 6 Aug 2018 23:52:43 +0000 (16:52 -0700)]
Merge Android Pie into master
Bug:
112104996
Change-Id: I7a2d421f293726a9e9db797f137601d73c9223eb
Steven Moreland [Fri, 27 Jul 2018 21:20:45 +0000 (14:20 -0700)]
Remove path from hidl_package_root. am:
9720abcd5a am:
184aad2a8f
am:
0e0f0e7bf8
Change-Id: I1c020c90a357b171bb41ee7121c50275d9d304af
Steven Moreland [Fri, 27 Jul 2018 21:15:37 +0000 (14:15 -0700)]
Remove path from hidl_package_root. am:
9720abcd5a
am:
184aad2a8f
Change-Id: I08ec3b53f7ddbd800eede7f8d6a251f04e365c1d
Steven Moreland [Fri, 27 Jul 2018 21:10:32 +0000 (14:10 -0700)]
Remove path from hidl_package_root.
am:
9720abcd5a
Change-Id: I1f7924c1a00cfaadab8796b61ffd3162b66fac4b
Steven Moreland [Fri, 27 Jul 2018 16:42:48 +0000 (09:42 -0700)]
Remove path from hidl_package_root.
This now defaults to the current path making references
to it relocatable.
Bug:
111366989
Test: make hidl interfaces under this package root
(this exercises the new path)
Change-Id: Id0629f4e8fa066b5cddae71016f52dcd3d5e129a
Xin Li [Sat, 9 Jun 2018 11:01:04 +0000 (04:01 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am:
c2e1ca1aac
Change-Id: I66031f4bd7b288e4ab6564939a238bcfc31ab9e7
Xin Li [Fri, 8 Jun 2018 18:09:22 +0000 (11:09 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug:
79597307
Change-Id: Id45caa0bfe6e942d9bdb835dc87345a87071bba3
Bernie Innocenti [Tue, 22 May 2018 04:19:29 +0000 (21:19 -0700)]
Fix NetdHidlTest.TestAddRemoveInterfaces() am:
84777b06df
am:
073f5088c5
Change-Id: I1af658298b2fc10c857de01cff3a31a5e5c158e6
Bernie Innocenti [Tue, 22 May 2018 04:12:22 +0000 (21:12 -0700)]
Fix NetdHidlTest.TestAddRemoveInterfaces()
am:
84777b06df
Change-Id: I8aea1d82b2bf3b55505f22a4f79d8d257a4341ea
Bernie Innocenti [Fri, 27 Apr 2018 08:34:30 +0000 (17:34 +0900)]
Fix NetdHidlTest.TestAddRemoveInterfaces()
The regex in countRulesForFwmark() overeagerly matched rules ending
in the same hex digit. For instance, fwmark=3 would match both these
lines:
from all fwmark 0xd0003/0xdffff iif lo lookup netd13474_27190
from all fwmark 0x10063/0x1ffff iif lo lookup local_network
This fix consists in matching either just 0x3, or the zero-padded 0003.
Bug:
74922133
Test: as follows:
m VtsHalNetNetdV1_1TargetTest && \
adb push out/.../VtsHalNetNetdV1_1TargetTest /data/ && \
adb shell /data/VtsHalNetNetdV1_1TargetTest
Change-Id: If6df9fa6cf843a5593ce61d87366c23383bb4d81
(cherry picked from commit
64848957ba49275896c80790ceeeb6219930f687)
android-build-team Robot [Sun, 29 Apr 2018 07:28:04 +0000 (07:28 +0000)]
Snap for
4751833 from
64848957ba49275896c80790ceeeb6219930f687 to pi-release
Change-Id: Ic167b25d177db6ad0c9204f66ed148d33e99a74a
Bernie Innocenti [Sat, 28 Apr 2018 00:43:14 +0000 (17:43 -0700)]
Fix NetdHidlTest.TestAddRemoveInterfaces()
am:
64848957ba
Change-Id: I6915ed661784663ae10cb593e1081ea9c8c688f3
Bernie Innocenti [Fri, 27 Apr 2018 08:34:30 +0000 (17:34 +0900)]
Fix NetdHidlTest.TestAddRemoveInterfaces()
The regex in countRulesForFwmark() overeagerly matched rules ending
in the same hex digit. For instance, fwmark=3 would match both these
lines:
from all fwmark 0xd0003/0xdffff iif lo lookup netd13474_27190
from all fwmark 0x10063/0x1ffff iif lo lookup local_network
This fix consists in matching either just 0x3, or the zero-padded 0003.
Bug:
74922133
Test: as follows:
m VtsHalNetNetdV1_1TargetTest && \
adb push out/.../VtsHalNetNetdV1_1TargetTest /data/ && \
adb shell /data/VtsHalNetNetdV1_1TargetTest
Change-Id: If6df9fa6cf843a5593ce61d87366c23383bb4d81
android-build-team Robot [Sun, 1 Apr 2018 07:21:00 +0000 (07:21 +0000)]
Snap for
4693621 from
9a9a0772bc04427f3cc23289501a6b56463d1db1 to pi-release
Change-Id: I24dc0eba050216b702dc2e831055251fc87c0e52
Keun Soo Yim [Fri, 30 Mar 2018 19:19:20 +0000 (19:19 +0000)]
Merge "update OWNERS for VTS" into pi-dev
am:
9a9a0772bc
Change-Id: I49a76fb5f97b5dc40880e740ab775bb92b3e83aa
TreeHugger Robot [Fri, 30 Mar 2018 17:50:33 +0000 (17:50 +0000)]
Merge "update OWNERS for VTS" into pi-dev
Lorenzo Colitti [Fri, 30 Mar 2018 17:12:28 +0000 (17:12 +0000)]
[automerger skipped] Add tests for INetd 1.1.
am:
f95d0c28b6 -s ours
Change-Id: If776ebfdd2f0791ac63581f5c4bd9db4f1dc647d
Lorenzo Colitti [Fri, 30 Mar 2018 17:12:22 +0000 (17:12 +0000)]
[automerger skipped] Make the VTS tests for the INetd HAL 1.0 more realistic.
am:
65ae996fca -s ours
Change-Id: I95315fe8cf41fbae8b99b250eb72a5748577958b
Keun Soo Yim [Fri, 30 Mar 2018 16:06:16 +0000 (09:06 -0700)]
update OWNERS for VTS
Test: inspection
Bug:
75325573
Change-Id: I61c0d7fd4c4ca49e9370c8dc2bcfc5e00812aec1
Lorenzo Colitti [Thu, 8 Feb 2018 10:58:31 +0000 (19:58 +0900)]
Add tests for INetd 1.1.
Bug:
73032258
Test: VtsHalNetNetdV1_0TargetTest and VtsHalNetNetdV1_1TargetTest passes on marlin
Change-Id: Id4d49f08563982353a9a7db79b569e933ea03c46
Merged-In: Id4d49f08563982353a9a7db79b569e933ea03c46
(cherry picked from commit
94832f94dc902b130bf3b2814e9addc2f27a2840)
Lorenzo Colitti [Tue, 13 Mar 2018 04:08:01 +0000 (04:08 +0000)]
Make the VTS tests for the INetd HAL 1.0 more realistic.
The VTS test for the netd HAL creates an OEM network, but it
doesn't check whether the network exists. Fix that by using
the native multinetwork API calls to select the network.
Also, check that when an OEM network is created, there are no IP
rules that select for its fwmark. There should be none because
a network that has just been created has no interfaces.
Put utility code into a new VtsHalNetNetdTestUtils static library
to avoid code duplication when we add new tests for future HALversions.
Bug:
73032258
Test: VtsHalNetNetdV1_0TargetTest passes on marlin
Change-Id: I345b9b27d7c2c8bdd6ce6d60430490dac8c3a989
Merged-In: Ie574990f7640fdc7d83ccd58baf6dfe1069a3654
(cherry picked from commit
79f693702c35dca81f7390d1619736a204e61a70)
android-build-team Robot [Sun, 18 Mar 2018 07:25:05 +0000 (07:25 +0000)]
Snap for
4662252 from
61323db76114d7115ad44281eba81801a562828c to pi-release
Change-Id: Iabd6928174603f91e1d4cf3790d338ee0156a169
Steven Moreland [Thu, 15 Mar 2018 18:13:26 +0000 (18:13 +0000)]
Freeze HALs for Android P
am:
61323db761
Change-Id: I3899796c588e5254a2b6ce4ca5beb6556ebc50dd
Steven Moreland [Wed, 14 Mar 2018 23:12:33 +0000 (16:12 -0700)]
Freeze HALs for Android P
Bug:
68112778
Test: none
Change-Id: Ic3617e937a4589f5ef6a40b4831c9a77328215e0
Lorenzo Colitti [Wed, 14 Mar 2018 18:47:12 +0000 (18:47 +0000)]
Add tests for INetd 1.1. am:
94832f94dc
am:
2cf1f13200
Change-Id: Ib42934f33261172bd8e9884fabbb814491067b59
Lorenzo Colitti [Wed, 14 Mar 2018 18:27:07 +0000 (18:27 +0000)]
Add tests for INetd 1.1.
am:
94832f94dc
Change-Id: Ie8e6da55140ff1f1e42731e9ce41ca08f864ca96
Lorenzo Colitti [Tue, 13 Mar 2018 04:08:01 +0000 (04:08 +0000)]
Make the VTS tests for the INetd HAL 1.0 more realistic. am:
79f693702c
am:
065b170e64
Change-Id: Ie574990f7640fdc7d83ccd58baf6dfe1069a3654
Lorenzo Colitti [Tue, 13 Mar 2018 04:02:59 +0000 (04:02 +0000)]
Make the VTS tests for the INetd HAL 1.0 more realistic.
am:
79f693702c
Change-Id: Id951ad6982142a423ffb881979d0ad9e660b4afe
Lorenzo Colitti [Thu, 8 Feb 2018 10:58:31 +0000 (19:58 +0900)]
Add tests for INetd 1.1.
Bug:
73032258
Test: VtsHalNetNetdV1_0TargetTest and VtsHalNetNetdV1_1TargetTest passes on marlin
Change-Id: Id4d49f08563982353a9a7db79b569e933ea03c46
Lorenzo Colitti [Wed, 7 Feb 2018 05:49:04 +0000 (14:49 +0900)]
Make the VTS tests for the INetd HAL 1.0 more realistic.
The VTS test for the netd HAL creates an OEM network, but it
doesn't check whether the network exists. Fix that by using
the native multinetwork API calls to select the network.
Also, check that when an OEM network is created, there are no IP
rules that select for its fwmark. There should be none because
a network that has just been created has no interfaces.
Put utility code into a new VtsHalNetNetdTestUtils static library
to avoid code duplication when we add new tests for future HALversions.
Bug:
73032258
Test: VtsHalNetNetdV1_0TargetTest passes on marlin
Change-Id: I345b9b27d7c2c8bdd6ce6d60430490dac8c3a989