Commit Graph

4930 Commits

Author SHA1 Message Date
nharold
001439d72a Merge "IpSec - API Tweak for removeTransportModeTransform" am: 6725ff729b am: d58b237445
am: 723d0f061a

Change-Id: I479c24d9ac5d4b022ec6310395fdb4274cfd5598
2018-01-17 20:50:14 +00:00
nharold
723d0f061a Merge "IpSec - API Tweak for removeTransportModeTransform" am: 6725ff729b
am: d58b237445

Change-Id: Id9e9ab09669a53f53f03e5a6e0e4757434c3f3f3
2018-01-17 20:39:29 +00:00
nharold
6725ff729b Merge "IpSec - API Tweak for removeTransportModeTransform" 2018-01-17 19:07:10 +00:00
nharold
1ff0770d76 Merge changes from topic "ipsec-oneway-transform" am: 809bcfc45e am: f2074ea62a
am: c6021f02b5

Change-Id: I2a90cf423a3ac9a0526831ef767ad019e7be053c
2018-01-17 10:07:33 +00:00
Nathan Harold
55d72e1c44 Make Transforms Unidirectional am: a25233123b am: f4fc2714c2
am: 02f8dcad8a

Change-Id: I608be255a307891ec3fe2d97cda817d75240c95c
2018-01-17 10:03:31 +00:00
nharold
c6021f02b5 Merge changes from topic "ipsec-oneway-transform" am: 809bcfc45e
am: f2074ea62a

Change-Id: I58fe595ff14e3ee6be5191171367e8a2f7fad6da
2018-01-17 09:53:37 +00:00
Nathan Harold
02f8dcad8a Make Transforms Unidirectional am: a25233123b
am: f4fc2714c2

Change-Id: Ie3ca37e14d977fd255a7791ae3332ddda29ab37e
2018-01-17 09:50:37 +00:00
Nathan Harold
f4fc2714c2 Make Transforms Unidirectional
am: a25233123b

Change-Id: I7e80c75b3b227fdd16479120d8b7203cc5f28d1c
2018-01-17 09:37:57 +00:00
Nathan Harold
f73d252c8f IpSec - API Tweak for removeTransportModeTransform
Because IpSecTransforms are now unidirectional,
and because the only mechanism for removing Transforms
removes it from both directions, the API can no longer
use the Transform parameter to meaningfully validate
that the caller had applied a transform. Since that
functionality was as-yet unimplemented and is now
infeasible, the transform parameter is removed.

Bug: 72079356
Test: cts - IpSecManagerTest; runtest frameworks-net
Change-Id: If19b0d34bdc6daf31a40d6d62bff326dcbca08c0
2018-01-17 01:11:46 -08:00
nharold
809bcfc45e Merge changes from topic "ipsec-oneway-transform"
* changes:
  Update IpSecService UnitTests
  Make Transforms Unidirectional
2018-01-17 08:40:37 +00:00
Nathan Harold
5676f5fdae Update IpSecService UnitTests
The IpSecService Unit tests relied on the
directionality of the IpSecConfig and previously
did not specify a source address. Unit tests
updated without functional change other than to
address these two requirements.

Bug: 71717213
Test: runtest frameworks-net
Change-Id: Iedbed735bc50fd4fdfe985f9e173956062a7b0d1
2018-01-16 19:38:10 -08:00
Nathan Harold
a25233123b Make Transforms Unidirectional
Convert the IpSecTransform from being a bi-directional
pair of SAs to a unidirectional single SA. This CL
also removes the concept of "direction from SAs meaning
that a IpSecTransform may now be applied to a socket
in either direction.

-Make transforms unidirectional
-Add Convert allocateSpi() to use destination rather
 than direction and remote address
-Remove directionality from builders for IpSecTransform
-Change applyTransportModeTransform() to take a
 direction in which to apply the transform object.
-Additional minor naming updates
-Restrict IpSecConfig to only print keys on eng builds
-Move DIRECTION constants to IpSecManager
-Add sourceAddress parameter to IpSecTransform to provide
 additional guarantees about the source address of data;
 (explicit failure rather than implicit failure).
-Move SPI to the build() method of IpSecTransform

Bug: 71717213
Test: runtest frameworks-net, CTS - IpSecManagerTest
Change-Id: I0824b37f443f4b8c62536d9801238c63ed8f2a1c
2018-01-16 11:08:31 -08:00
Lorenzo Colitti
ff12e41c60 Merge changes I0d0c0fac,Ifb9b00b6 am: c3a209382c am: bfaf963337
am: e735296091

Change-Id: I919f21566d5caff9fb35f57c439048b9b48f0971
2018-01-16 18:59:02 +00:00
Lorenzo Colitti
e735296091 Merge changes I0d0c0fac,Ifb9b00b6 am: c3a209382c
am: bfaf963337

Change-Id: Ie943428132fbcfcc565d54b46830ed297227ef35
2018-01-16 18:41:46 +00:00
Treehugger Robot
c3a209382c Merge changes I0d0c0fac,Ifb9b00b6
* changes:
  Split updateCapabilities into two methods.
  More strictly check NetworkCapabilities callbacks.
2018-01-16 14:25:13 +00:00
Lorenzo Colitti
870a596ed3 Merge "Update netId to nethandle mapping in NetworkTest." am: a04d0cc72f am: 503135596b
am: d9d2a71d6f

Change-Id: I6feaa589fc43ff8ee1635be0fbd58aaa25679a5a
2018-01-16 13:46:46 +00:00
Lorenzo Colitti
d9d2a71d6f Merge "Update netId to nethandle mapping in NetworkTest." am: a04d0cc72f
am: 503135596b

Change-Id: I5e8e57f38580742eae38f63f43e37cc647412212
2018-01-16 13:34:46 +00:00
Treehugger Robot
a04d0cc72f Merge "Update netId to nethandle mapping in NetworkTest." 2018-01-16 12:23:02 +00:00
Hugo Benichi
060f3cc2b5 Merge "MacAddress: add @NonNull annotations" am: e65a016d76 am: a7c125e5b2
am: 697b7fe9e1

Change-Id: Ib525e2429609ce12c2be5bbeacffa217b65bebe3
2018-01-16 10:40:56 +00:00
Hugo Benichi
697b7fe9e1 Merge "MacAddress: add @NonNull annotations" am: e65a016d76
am: a7c125e5b2

Change-Id: Icaa08c082797c6dbc3382e0662e24e1c84114175
2018-01-16 10:30:20 +00:00
Lorenzo Colitti
8bdf996b17 Update netId to nethandle mapping in NetworkTest.
Bug: 63052780
Test: NetworkTest now passes
Change-Id: I5f1cb3055b7042a19afb5dd62f082912157612ba
2018-01-16 17:19:04 +09:00
Hugo Benichi
48872c6342 MacAddress: add @NonNull annotations
This patch adds to the MacAddress class:
  - getAddressType() method which replaces addressType(), for naming
  consistency
  - @NonNull annotations on all input and output reference values for
  all public methods (@hide and public).

TYPE_UNKNOWN, which currently cannot be observed with a non @hide
method, is also removed from the public api.

Bug: 71866627
Test: $ runtest frameworks-net
Change-Id: I2af70408d46f431b7b32183e6b48ddae9a261a2c
2018-01-16 13:32:59 +09:00
Lorenzo Colitti
273345499b More strictly check NetworkCapabilities callbacks.
This change more strictly accounts for onCapabilitiesChanged
callbaks and their values. It exposes several cases where we the
callbacks we send are spurious.

Test: ConnectivityServiceTest continues to pass
Change-Id: Ifb9b00b6f0cae48f8ed41a525100d1744b5f429b
2018-01-16 00:25:13 +09:00
TreeHugger Robot
143de94533 Merge "Add performance test for BroadcastReceiver" 2018-01-12 23:31:15 +00:00
Arthur Eubanks
263d674d59 Add performance test for BroadcastReceiver
This is intended to be the first of multiple performance tests around
ActivityManager.

This also refactors some of the existing performance utils so that a
BenchmarkState which accepts the elapsed time rather than measures it
can be added (ManualBenchmarkState).

This test measures the current time, sends a Broadcast, the target APK
receives it, measures the current time, and sends its measured time
back to the test APK.

Test: m ActivityManagerPerfTestsTestApp ActivityManagerPerfTests
Test: adb install $OUT/data/app/ActivityManagerPerfTestsTestApp/ActivityManagerPerfTestsTestApp.apk
Test: adb install $OUT/data/app/ActivityManagerPerfTests/ActivityManagerPerfTests.apk
Test: adb shell am instrument -w -e class \
com.android.frameworks.perftests.am.tests.BroadcastPerfTest \
com.android.frameworks.perftests.amtests/android.support.test.runner.AndroidJUnitRunner

Bug: 67460485

Change-Id: Ib1606ff60c6a845088bde5bd1a33294765b88b36
2018-01-12 09:54:13 -08:00
Erik Kline
3096bc6311 Merge changes I47ccfa99,I5db1de3e am: 08498c32f4 am: 03f3294103
am: 805104f40f

Change-Id: Ic774b944238d6df07511df8e467d66cefcd4fa81
2018-01-11 12:52:19 +00:00
Erik Kline
805104f40f Merge changes I47ccfa99,I5db1de3e am: 08498c32f4
am: 03f3294103

Change-Id: I311f6c299daf1c8d21731187d8e78e55c5767564
2018-01-11 12:43:38 +00:00
Erik Kline
1742fe1309 Extract DNS setting logic into DnsManager class
In future, managing DNS-over-TLS hostname lookup and netd programming
can be encapsulated here.

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 64133961
Change-Id: I47ccfa99c30c780524c45c4af605e720ccba34a0
2018-01-11 18:16:50 +09:00
Erik Kline
e89953b30f Add minimal test for setting DNS properties
Test: as follows
Change-Id: I5db1de3ee8e179edd56c93988b821242b81c2387
2018-01-11 18:16:20 +09:00
Lorenzo Colitti
4bc8984ec8 Merge "Move more core networking tests to framework/base/tests/net." am: d6c3813c08 am: 8f852c341f
am: 56dba0323a

Change-Id: I1eb98a82426d7b7e085316f8a67cdd1e81912538
2018-01-11 04:17:51 +00:00
Lorenzo Colitti
56dba0323a Merge "Move more core networking tests to framework/base/tests/net." am: d6c3813c08
am: 8f852c341f

Change-Id: Iab87e7ce5b62a1ff21c7aee5d0f25597713f6c65
2018-01-11 04:10:01 +00:00
Erik Kline
ccd67750bc Merge "Refactor to InterfaceParams utility class" am: 6a91687bcd am: fe83298cd5
am: 2be133a54e

Change-Id: I878be7b33afcad9544515e90da4db02fe85b92cc
2018-01-11 04:09:49 +00:00
Erik Kline
2be133a54e Merge "Refactor to InterfaceParams utility class" am: 6a91687bcd
am: fe83298cd5

Change-Id: Icb708a5ea7c3b41cb9d23885018b088c65ee427b
2018-01-11 04:02:15 +00:00
Lorenzo Colitti
d6c3813c08 Merge "Move more core networking tests to framework/base/tests/net." 2018-01-11 03:09:40 +00:00
Erik Kline
8bd00d5f7c Refactor to InterfaceParams utility class
NetworkInterface throws Exceptions every time you look at it askance.
Try to make something we instantiate fully, once, and pass it around.

Partial MacAddress-ification as well, for good measure.

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - basic IPv6 tethering works
Bug: 32163131
Bug: 62476366
Change-Id: I16c145fddb4e76387370338d792a438eed886d7f
2018-01-11 09:47:40 +09:00
TreeHugger Robot
1b3adf9470 Merge "Inline noti blocking is now in the form of a question" 2018-01-10 23:49:14 +00:00
Julia Reynolds
437cdb1464 Inline noti blocking is now in the form of a question
And has an 'undo' flow that matches snoozing.

Test: runtest systemui
Bug: 63927402
Change-Id: Idc17b8d950bc3da7ec9fe035dc8a65146d12c456
2018-01-10 12:56:57 -05:00
Lorenzo Colitti
6fbb21a8dc Move more core networking tests to framework/base/tests/net.
Test: "runtest frameworks-net" passes except for already-failing IpConnectivityMetricsTest
Change-Id: I2a20d546089699ac67bc819f10a8fcd50c637ac4
2018-01-10 23:35:16 +09:00
Alan Stokes
3d25d07ffd Merge "More DexLoggerIntegrationTests tweaks." 2018-01-10 09:26:06 +00:00
Benedict Wong
e65973c571 Merge "Add validation to IpSecConfig algorithm setters" am: a954f20f46 am: c93df5ca1c
am: 764a0b739a

Change-Id: I7ff85771945c68025ce8d66ca85313bac087b3a5
2018-01-09 21:23:35 +00:00
Benedict Wong
764a0b739a Merge "Add validation to IpSecConfig algorithm setters" am: a954f20f46
am: c93df5ca1c

Change-Id: I45289bc8e8b93f7eb912a76a10b951b1a615338a
2018-01-09 19:51:19 +00:00
Benedict Wong
a954f20f46 Merge "Add validation to IpSecConfig algorithm setters" 2018-01-09 18:18:28 +00:00
Alan Stokes
55d11f6197 More DexLoggerIntegrationTests tweaks.
Add @LargeTest explicitly.
Change package to ...pm.dex for consistency with other tests
(and because that's where the code being tested lives).

Test: atest DexLoggerIntegrationTests
Bug: 63927552
Change-Id: Id76258292f318b331f19fac01fdbd94ed33e2d2e
2018-01-09 13:39:49 +00:00
Dan Albert
48d2398125 Merge "Move to libc++ from stlport." am: c6dd5f9037 am: 81da46f982
am: eff28b5863

Change-Id: Ia45b5a174feaddff5e5839a231af18fb5bb3cb7a
2018-01-08 21:25:59 +00:00
Dan Albert
eff28b5863 Merge "Move to libc++ from stlport." am: c6dd5f9037
am: 81da46f982

Change-Id: I3c7f169097ef1c4d17263893a18ad21b9dae7d49
2018-01-08 21:09:59 +00:00
Dan Albert
283965eaa9 Move to libc++ from stlport.
Test: make checkbuild
Bug: None
Change-Id: If2be2abedec1abb2970e8c42170d4a69c0fb4e3d
2018-01-05 11:08:20 -08:00
Alan Stokes
1e24bf6043 Tidy up DexLoggerIntegrationTests.
Addressing comments from ag/3381420.
I also fixed two lines that were slightly too long.

Bug: 63927552
Test: atest DexLoggerIntegrationTests
Change-Id: I258d0aa2068c76175d30c0be9ba95482d3db9437
2018-01-05 14:36:00 +00:00
Benedict Wong
4f25570acd Add validation to IpSecConfig algorithm setters
Adds checks to ensure that users can only set the correct types of
algorithms for the Authentication, Encryption and Authenticated
Encryption algorithms.

Bug: 65223935
Test: Added tests in IpSecConfigTest, and passed on aosp_marlin-eng
Change-Id: I462c77d9eb5710b8d03a48866453649d3b6fc6bf
2018-01-04 16:56:40 -08:00
TreeHugger Robot
feeb12a962 Merge "Let wallpaper know when to animate AoD transition" 2018-01-05 00:32:25 +00:00
Philip P. Moltmann
79c238ada6 Use modern install method in backup service
Test: adb backup -apk myApp -f backup ; adb restore backup
Change-Id: I2bbcb0487ecc525a6dc8a2693b15ce624db275b0
2018-01-04 13:26:28 -08:00