385735 Commits

Author SHA1 Message Date
Lorenzo Colitti
51aa3312b2 Merge "Switch to positive naming for NetworkMonitor's Networks."
am: abfef61707

Change-Id: I40d7a7d5e4d80d734f53254c9d8cfc41ca0ce03c
2019-05-09 05:21:26 -07:00
Lorenzo Colitti
baee9317b5 Merge "Add tests for strict mode private DNS validation."
am: 6a4ae85e23

Change-Id: I55aba3a8537395d7dd20e10e96a20d097546f65b
2019-05-09 05:16:53 -07:00
Andrei-Valentin Onea
3423014cbe Merge "Support all UnsupportedAppUsage annotations in processor" 2019-05-09 12:13:29 +00:00
Tobias Thierer
52cd14f17f Merge "Fix for DropBoxManagerService on devices with large storage" 2019-05-09 12:00:34 +00:00
Lorenzo Colitti
abfef61707 Merge "Switch to positive naming for NetworkMonitor's Networks." 2019-05-09 11:57:50 +00:00
Lorenzo Colitti
6a4ae85e23 Merge "Add tests for strict mode private DNS validation." 2019-05-09 11:57:25 +00:00
Xiao Ma
c657a844ea Merge "adopt non-blocking method to obtain the IpMemoryStore service."
am: b340a6988b

Change-Id: Idd6110141795f86dcf28eafab87683eda4c70b93
2019-05-09 04:43:33 -07:00
Xiao Ma
b340a6988b Merge "adopt non-blocking method to obtain the IpMemoryStore service." 2019-05-09 11:30:56 +00:00
Lorenzo Colitti
32f240464c Merge "Change the icon for the captive portal login app."
am: d9614ed849

Change-Id: I5e70b6fa429ec64bb1902570e1415776f6924f51
2019-05-09 04:04:34 -07:00
Lorenzo Colitti
44ee418e07 Merge "Add a simple wrapper for IpClient."
am: fa214ebcb8

Change-Id: Ia24641542979ffa18b3f28743766b99a2fda6564
2019-05-09 03:54:15 -07:00
Lorenzo Colitti
d9614ed849 Merge "Change the icon for the captive portal login app." 2019-05-09 10:51:23 +00:00
Lorenzo Colitti
fa214ebcb8 Merge "Add a simple wrapper for IpClient." 2019-05-09 10:36:16 +00:00
Chalard Jean
f4b136a78a Change the icon for the captive portal login app.
Looks like https://screenshot.googleplex.com/6n4Cf3LRv4A
Icon comes from frameworks/base/core/res/res/drawable/stat_notify_wifi_in_range.xml

Test: manual
Bug: 29924821
Change-Id: I378fdb2d493fb8598c3e4fa98e100696c72f88ea
2019-05-09 09:24:17 +00:00
Lorenzo Colitti
ac12b84ef0 Switch to positive naming for NetworkMonitor's Networks.
"mNonPrivateDnsBypassNetwork" is not very easy to understand.

Bug: 122652057
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: If5801c81c6ef222b46f631bd6570dcd0fea465bd
2019-05-09 17:58:49 +09:00
Lorenzo Colitti
62f3e53f68 Add tests for strict mode private DNS validation.
Test successful and failed validation, and updating the config.
In order to do this, add a FakeDns class so we can change DNS
responses dynamically while the test is running.

Also a couple of minor fixes:
1. Make sure the DNS timeout is set. Before this CL, it was
   always 0. Not sure why. It does seem to be set to the default
   value (12500) when actually running on device. We didn't
   catch this because the only tests that use the timeout set it
   explicitly.
2. Make runNetworkTest a bit more realistic: always send
   NetworkCapabilities *before* calling notifyNetworkConnected.
   This is what ConnectivityService does.

Bug: 122652057
Test: atest FrameworksNetTests NetworkStackTests
Test: atest --generate-new-metrics 50 NetworkStackTests:com.android.server.connectivity.NetworkMonitorTest
Change-Id: Ifd6694262501874f3261c864a049cb35c6afb9c8
2019-05-09 17:58:48 +09:00
Lorenzo Colitti
e9da42203f Add a simple wrapper for IpClient.
This takes care of boilerplate tasks such as clearing calling
identity, catching RemoteExceptions, and converting to stable
parcelable objects.

Bug: 131206163
Test: builds, boots, wifi works
Test: atest FrameworksNetTests
Change-Id: I7cbe5fc105503d0983cba2bf77fb0097bd20d9ba
2019-05-09 17:58:48 +09:00
paulhu
cc95b066a3 Add LinkProperties common test cases
Bug: 129198747
Test: atest FrameworksNetTests
Test: atest CtsNetTestCases: added tests pass
Change-Id: I15b8dbd060c313d0f2be89fed4518c18b3196d38
2019-05-09 15:49:00 +08:00
Etan Cohen
7c49d9b39d Merge "[CS] Unregister callback as part of onUnavailable dispatch"
am: 6b88a9192a

Change-Id: I14d3c0f6c606020bd1d1e756174a66ee933cb15f
2019-05-08 22:13:00 -07:00
Etan Cohen
6b88a9192a Merge "[CS] Unregister callback as part of onUnavailable dispatch" 2019-05-09 03:57:29 +00:00
Etan Cohen
9b09a16930 [CS] Unregister callback as part of onUnavailable dispatch
The onUnavailable semantics promise that it is equivalent to calling
the unregister callback method. But - it doesn't unregister the callback
allowing it to be reused. Fixed.

Additionally, modified the unregisterNetworkCallback method to not fail
on duplicate unregistration (since a callback could now self
unregister). Instead simply print a log.

Bug: 130651445
Test: atest ConnectivityServiceTest
Change-Id: I4c54b003a733eb0b1e4fd8674ed13081b1bef8e3
2019-05-09 02:41:40 +00:00
Xiao Ma
a489a8d495 adopt non-blocking method to obtain the IpMemoryStore service.
Test: atest FrameworksNetTests
Change-Id: I7de4f23370bdf9c9df5e74ed074c794080d93d95
2019-05-09 10:39:50 +09:00
Kyeongkab.Nam
2843b7e22f Add encryption information to TvTrackInfo
Add TIF API for getting encryption status of each tracks in order for
TV App to use it.

Test: build
Bug: 112835103
Change-Id: I3065358d20d17c688e3349140b44d443fc34965d
2019-05-09 01:20:12 +00:00
Stephen Hines
d17f06d488 NFC: Fix implicit fallthrough warning.
Bug: http://b/112564944
Test: Builds.
Change-Id: I3cbb6e751b1341ae8a9abcd04bd16c6b81156ff0
2019-05-08 16:41:06 -07:00
Thom Hurks
17a01554c7 Use correct variable for init in GsmAlphabet
When initializing the shift table in GsmAlphabet the correct
variable is now used. An error was logged already if the value
is wrong, so this does not have any logic correctness or
performance impact, just code correctness.
Test: very small refactoring. Tests still pass.

Change-Id: I5329cfa0be63b6a3ebd06414c6247d94ca93f40b
Signed-off-by: Thom Hurks <thomhurks@gmail.com>
2019-05-09 00:01:13 +02:00
Haibo Huang
bbd62aff7a Merge "Update to follow the new google benchmark API"
am: d22ba181d0

Change-Id: Ie5065ff193bfe187683e729d589138c24f4f2fac
2019-05-08 14:48:57 -07:00
Haibo Huang
d22ba181d0 Merge "Update to follow the new google benchmark API" 2019-05-08 21:18:40 +00:00
Benedict Wong
ad1e0006b1 Merge "Add IPsec tunnel mode feature flag"
am: 86f2f55b86

Change-Id: I495ff2bfe4f60dfd77176bcd331816667ccd9c36
2019-05-08 13:30:11 -07:00
Benedict Wong
86f2f55b86 Merge "Add IPsec tunnel mode feature flag" 2019-05-08 20:04:06 +00:00
Steven Moreland
ded421f535 HwBinder: register with registerAsServiceInternal
This ties together the Java/C++ logic for service registration.

Bug: 36424585
Test: boot
Change-Id: I1fe8266e7d291e3253af492e9321bd5a24da4cc3
2019-05-08 19:54:51 +00:00
Elliott Hughes
7a6cc0c006 Track libziparchive API change.
Bug: http://b/129068177
Test: treehugger
Change-Id: Id4b202502b07e08102deda49f7d28ba10a63bb0a
2019-05-08 12:29:25 -07:00
Haibo Huang
5eb2e96898 Update to follow the new google benchmark API
Test: build
Change-Id: Icc25b81e9b863c35c02c9673518fa4d30e9ae321
2019-05-08 18:29:01 +00:00
Andrei Onea
5e22614098 Support all UnsupportedAppUsage annotations in processor
Add support for the libcore UnsupportedAppUsage annotation to
UnsupportedAppUsageProcessor. This is in order to make the two
annotations even more interchangeable.
Also take the opportunity to correct the documentation:
UnsupportedAppUsageProcessor no longer is involved in creating
greylist.txt, that functionality has been moved to
Class2Greylist.java in the art repository.

Bug: 130721457
Test: m framework-annotation-proc
Change-Id: I5cf1f97ca41349fc053315a2fd5bfd53a80ae128
2019-05-08 18:03:15 +01:00
Frank Li
351cc241da Merge "Extend NetworkDnsEventReported and add new DnsCallReported to log per-query information"
am: 8ff4a5a5b5

Change-Id: I16ada24faf991dc95326c9c56df9daa3a07519ba
2019-05-07 21:18:01 -07:00
Junyu Lai
17a45f4d6e Revert "[KA11] Verify fd ownership and allocate resource for NattKeepalive"
This reverts commit cecd4a3d64a0fc6006c133ab2a35be44f5d6fb4b.

Reason for revert: Adds dependency between IpSecService and
                   ConnectivityService may lead to future deadlock
                   problems. Uses a simpler approach instead,
                   hence the solution is not needed.
                   See aosp/954040.

Change-Id: If6d537a39595cf132d3ed81d4eaac6700f5f0ab3
2019-05-08 11:44:20 +08:00
Benedict Wong
bc9c098e12 Add IPsec tunnel mode feature flag
This patch adds a feature flag for IPsec Tunnel Mode. This implies VTI
(with output-mark updating), or XFRM-I in the kernels.

Bug: 117183273
Test: Compiles
Change-Id: I6dd0e429cc0bd100f2ef1140a6651f6ef5294c79
Merged-In: I6dd0e429cc0bd100f2ef1140a6651f6ef5294c79
(cherry picked from commit dc92c69b087d5fbecff76ef1e739ae415312734d)
2019-05-07 20:12:17 -07:00
Frank Li
8ff4a5a5b5 Merge "Extend NetworkDnsEventReported and add new DnsCallReported to log per-query information" 2019-05-08 03:01:38 +00:00
Jordan Liu
7ac267a585 Merge "Update getCardId doc with details"
am: a0a72ec485

Change-Id: Ic6c014f7b086fad8b7fa131366839e35ebbd7dd1
2019-05-07 15:00:32 -07:00
android-build-team Robot
7c2cd6a19a Snap for 5450365 from 2a21bea448c56d892cf7c726771889ff2299f4d5 to pi-platform-release
Change-Id: I944e7d1ac9deebd68b7a3d2f3b8200df78a23099
2019-05-07 21:45:49 +00:00
Dmytro Chystiakov
cbb5000b70 Fix for DropBoxManagerService on devices with large storage
DropBoxManagerService does not save any data to the storage
due to int overflow when it's trying to get available space
on devices with large storage (like 1TB)

Bug: b/131354250
Test: Run CTS with command "run cts -m CtsIncidentHostTestCases
	-t com.android.server.cts.ErrorsTest"

Change-Id: Ib1b0d4decb48e9e771ef39127364131e6aa05662
Signed-off-by: Dmytro Chystiakov <dmytro.chystiakov@intel.com>
2019-05-07 14:39:06 -07:00
Jordan Liu
a0a72ec485 Merge "Update getCardId doc with details" 2019-05-07 21:26:02 +00:00
Chenbo Feng
05887f99c6 Clean up the permission control code in framework
Delete the unused NetworkManagementService API for set/remove
permissions. Use PERMISSION_NONE to replace NO_PERMISSIONS so the
framework now use the same set of permission constant when communicate
with netd.

Bug: 128944261
Test: PermissionMonitorTest.java

Change-Id: I25224c9576f52d2a0a0bd2182325c7aac7b28eb5
2019-05-07 13:50:25 -07:00
Kamen Kirov
a05a067674 Merge "Fix incorrect parsing of UVC interface descriptor"
am: 74458cbdf0

Change-Id: Ie1359f65e2ad72c1567cd426f8eebfc24b053f46
2019-05-07 13:10:26 -07:00
Treehugger Robot
74458cbdf0 Merge "Fix incorrect parsing of UVC interface descriptor" 2019-05-07 19:11:33 +00:00
Shuo Qian
22f7e515c5 Merge "Sorting and merge Emergency number better"
am: 70ed8dba68

Change-Id: Ic04771d79d96affb99876fe92a9768937ea93885
2019-05-07 11:18:12 -07:00
Shuo Qian
70ed8dba68 Merge "Sorting and merge Emergency number better" 2019-05-07 18:02:54 +00:00
sqian
a686f723a8 Sorting and merge Emergency number better
Apply more parameters to sort Emergency number list, it is important
to keep two lists Collection-equal to each other if they have the same
contents. Otherwise, it will introduce more unnecessary updates in
 EmergencyNumberTracker and it may confuse users.

Test: atest EmergencyNumberTest
Bug: 131922424
Change-Id: I64a43886d4000b261ea703b081e6278b0307805f
Merged-In: I64a43886d4000b261ea703b081e6278b0307805f
(cherry picked from commit a1f21a5c2cd4cdc14f4cbf7cd0fc0de6e4911c02)
2019-05-07 09:21:26 -07:00
Anton Hansson
f529cbcd26 Merge "Update path to audio files"
am: 5c47b52b93

Change-Id: Iee4977f78ae5b5c17f6dfee198d49aede92012a7
2019-05-07 03:00:51 -07:00
Anton Hansson
5c47b52b93 Merge "Update path to audio files" 2019-05-07 09:46:23 +00:00
Elliott Hughes
78791cd8d7 Merge "Track libziparchive API change."
am: 32581e1dd2

Change-Id: I498a0197bb6aab88217a4c796fd5bed7c1802e33
2019-05-06 17:18:37 -07:00
Elliott Hughes
32581e1dd2 Merge "Track libziparchive API change." 2019-05-06 23:45:16 +00:00