Paul Crowley
930efcaf19
Merge "v3 keys use SP800 derivation" into pi-dev
...
am: 83924aca2c
2019-01-29 14:41:51 -08:00
TreeHugger Robot
83924aca2c
Merge "v3 keys use SP800 derivation" into pi-dev
2019-01-29 21:53:43 +00:00
TreeHugger Robot
299f825678
Merge "Whitelist packages from VPN lockdown: DPM API." into pi-dev-plus-aosp
2019-01-29 21:44:13 +00:00
Sooraj Sasindran
d42041fe96
Merge "Define more thresholds for opportunistic data" am: cf2e069962
...
am: c3bf9392ac
2019-01-29 12:21:17 -08:00
Jack He
9513822f40
Merge changes I94d15307,I7deb8556,I755b3140 am: 5aef5c6508
...
am: b7493c6059
2019-01-29 12:11:12 -08:00
Sooraj Sasindran
c3bf9392ac
Merge "Define more thresholds for opportunistic data"
...
am: cf2e069962
2019-01-29 12:09:58 -08:00
Jack He
b7493c6059
Merge changes I94d15307,I7deb8556,I755b3140
...
am: 5aef5c6508
2019-01-29 11:53:43 -08:00
Sooraj Sasindran
cf2e069962
Merge "Define more thresholds for opportunistic data"
2019-01-29 19:43:26 +00:00
Pavel Grafov
5cba336daf
Whitelist packages from VPN lockdown: DPM API.
...
Bug: 77468593
Test: atest MixedDeviceOwnerTest#testAlwaysOnVpn
Test: atest MixedDeviceOwnerTest#testAlwaysOnVpnAcrossReboot
Change-Id: I7508070f828fb7150df5d9e34846535d57c6a7c3
2019-01-29 19:37:21 +00:00
Treehugger Robot
5aef5c6508
Merge changes I94d15307,I7deb8556,I755b3140
...
* changes:
Atom: Add more Bluetooth atoms
Atom: Add A2DP playback related atoms to StatsLog
Fix typo in hci/enums.proto: OCCURED -> OCCURRED
2019-01-29 19:27:53 +00:00
Android Build Merger (Role)
894ee44b53
Merge "Merge "Add check for slot index value" am: d8148b6c8c am: e7d03a6ff1" into pi-dev-plus-aosp
2019-01-29 17:45:39 +00:00
Michele Berionne
ef96c449ce
Merge "Add check for slot index value" am: d8148b6c8c
...
am: e7d03a6ff1
2019-01-29 09:45:09 -08:00
Andy Chou
8c8249d1ac
[automerger skipped] Merge "[DO NOT MERGE]Add check for slot index value" into pi-dev
...
am: dbf0f79d4adbf0f79d4a
2019-01-29 09:43:53 -08:00
Michele Berionne
e7d03a6ff1
Merge "Add check for slot index value"
...
am: d8148b6c8c
2019-01-29 09:34:53 -08:00
Michele Berionne
d8148b6c8c
Merge "Add check for slot index value"
2019-01-29 17:25:17 +00:00
Adrian Roos
ea23830f1b
Merge "apilint: Allow parsing 3.0 signature files" am: 34b11c92b3
...
am: f9cd2cb759
2019-01-29 08:33:45 -08:00
Adrian Roos
f9cd2cb759
Merge "apilint: Allow parsing 3.0 signature files"
...
am: 34b11c92b3
2019-01-29 08:23:14 -08:00
Adrian Roos
34b11c92b3
Merge "apilint: Allow parsing 3.0 signature files"
2019-01-29 16:05:21 +00:00
Remi NGUYEN VAN
1c073368f5
Merge "Revert "Extract network observer code from NetworkManagementService."" am: 9fdc6d2963
...
am: 04f4e4ed88
2019-01-29 06:59:13 -08:00
Remi NGUYEN VAN
04f4e4ed88
Merge "Revert "Extract network observer code from NetworkManagementService.""
...
am: 9fdc6d2963
2019-01-29 06:47:16 -08:00
Remi NGUYEN VAN
9fdc6d2963
Merge "Revert "Extract network observer code from NetworkManagementService.""
2019-01-29 14:30:56 +00:00
Adrian Roos
cf82e04400
apilint: Allow parsing 3.0 signature files
...
Test: python apilint_test.py
Change-Id: I59df950229c05329afde93f94efc13adb4640ad7
2019-01-29 15:01:28 +01:00
Andy Chou
dbf0f79d4a
Merge "[DO NOT MERGE]Add check for slot index value" into pi-dev
2019-01-29 12:28:47 +00:00
Chalard Jean
04c1e6533b
Merge "Move FdEventsReader to the shared area." am: 4a838a68d6
...
am: 06318332ef
2019-01-29 04:20:52 -08:00
Chalard Jean
06318332ef
Merge "Move FdEventsReader to the shared area."
...
am: 4a838a68d6
2019-01-29 04:11:44 -08:00
Treehugger Robot
4a838a68d6
Merge "Move FdEventsReader to the shared area."
2019-01-29 11:45:15 +00:00
Remi NGUYEN VAN
8a308349e3
Merge "Run IpClientLinkObserver on Binder thread" am: f89a1cfd21
...
am: d91372e4cb
2019-01-29 03:45:10 -08:00
Remi NGUYEN VAN
031e0aa44e
Merge "Add utils connect, setsockopt, bind, sendTo" am: 1e002eede3
...
am: dfa16fe772
2019-01-29 03:34:23 -08:00
Remi NGUYEN VAN
08747c5ccb
Merge "Add NetworkUtils utilities to SystemApi" am: 9cc31061fe
...
am: ca1d65e707
2019-01-29 03:29:01 -08:00
Remi NGUYEN VAN
d91372e4cb
Merge "Run IpClientLinkObserver on Binder thread"
...
am: f89a1cfd21
2019-01-29 03:25:26 -08:00
Remi NGUYEN VAN
dfa16fe772
Merge "Add utils connect, setsockopt, bind, sendTo"
...
am: 1e002eede3
2019-01-29 03:21:22 -08:00
Remi NGUYEN VAN
ca1d65e707
Merge "Add NetworkUtils utilities to SystemApi"
...
am: 9cc31061fe
2019-01-29 03:17:41 -08:00
Remi NGUYEN VAN
f89a1cfd21
Merge "Run IpClientLinkObserver on Binder thread"
2019-01-29 11:07:42 +00:00
Remi NGUYEN VAN
1e002eede3
Merge "Add utils connect, setsockopt, bind, sendTo"
2019-01-29 11:07:20 +00:00
Remi NGUYEN VAN
9cc31061fe
Merge "Add NetworkUtils utilities to SystemApi"
2019-01-29 11:07:04 +00:00
Remi NGUYEN VAN
bfd0aa022e
Revert "Extract network observer code from NetworkManagementService."
...
This reverts commit d8bc829a85
2019-01-29 10:21:19 +00:00
Chalard Jean
0bf364d92e
Move FdEventsReader to the shared area.
...
This is necessary both in the network stack app and the
framework.
Test: FrameworksNetTests
Change-Id: I48af0ab29405501f0581a6c0c9ce6e5d4a32c8b4
2019-01-29 18:35:11 +09:00
Remi NGUYEN VAN
117a843303
Merge "Remove IpClient usage of NetworkManagementService" am: 9fe79edfd2
...
am: 3af3f76129
2019-01-29 01:27:43 -08:00
Remi NGUYEN VAN
3af3f76129
Merge "Remove IpClient usage of NetworkManagementService"
...
am: 9fe79edfd2
2019-01-29 01:16:21 -08:00
Remi NGUYEN VAN
9fe79edfd2
Merge "Remove IpClient usage of NetworkManagementService"
2019-01-29 08:58:32 +00:00
Remi NGUYEN VAN
249da094eb
Add utils connect, setsockopt, bind, sendTo
...
The utilities are not supported as public API but required as SystemApi
for the NetworkStack.
Test: flashed, boots, WiFi works
Bug: 112869080
Change-Id: Ia64b3bf9c6c33cf61bed76469ea9963b550bed2b
2019-01-29 17:49:36 +09:00
Remi NGUYEN VAN
5c5f1ba99c
Add NetworkUtils utilities to SystemApi
...
attach*Filter and addArpEntry are necessary for the NetworkStack but are
only usable for apps that have system permissions.
Also includes system API for IpPrefix, LinkAddress, LinkProperties,
Network, and static modifier in ApfCapabilities that were missed in
previous CLs.
Test: Builds, flashed, WiFi works
Bug: 112869080
Change-Id: If141ae6a2f9145f5af64ba002ca44938f39b90a9
2019-01-29 17:30:26 +09:00
Remi NGUYEN VAN
1bbed8a3b8
Run IpClientLinkObserver on Binder thread
...
This restores previous behavior, where callbacks would not be called on
the IpClient handler thread.
Test: atest FrameworksNetTests NetworkStackTests
Test: flashed, WiFi works
Bug: 123062477
Change-Id: I3015566b0922d76ac7cf70579a1de3e033bf7b4a
2019-01-29 17:09:01 +09:00
Gnaneshwar Gatla
76557cc012
Merge "uce: Updating UCE API to accept ICC-ID." am: d20bdb915a
...
am: f0b1c48141
2019-01-28 23:53:35 -08:00
Mathieu Chartier
b8b007cb65
Merge "Disable view compilation for privileged apps" am: 3c496729de
...
am: ff52af9cdd
2019-01-28 23:45:27 -08:00
Kulwinder Singh
fc8a7159e0
Merge "Fix for CTS testAllowWhileIdleJobInTempwhitelist" am: 23b144eb40
...
am: 0e3645d84b
2019-01-28 23:30:33 -08:00
Pengquan Meng
59691cc266
Merge "new SystemAPI to getSimLocale" am: 5cf41e47fe
...
am: 1b607c875f
2019-01-28 23:03:32 -08:00
Remi NGUYEN VAN
ca7c41f5fa
Merge "Add SocketUtils for NetworkStack" am: cec60fa56a
...
am: 27ae908282
2019-01-28 22:57:39 -08:00
Colin Cross
5f34ef1c3d
Merge "clang-format ManifestFixer_test.cpp" am: 171c9cdc6a
...
am: 0b7bfe4c3f
2019-01-28 22:52:49 -08:00
Ruchi Kandoi
32b84ede51
Merge "Add Secure NFC functionality" am: 3ffdb26aa8
...
am: c538141c6d
2019-01-28 22:14:28 -08:00
