Commit Graph

4890 Commits

Author SHA1 Message Date
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
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
Alan Stokes
761d618a13 Add integration test for DexLogger.
Bug: 63927552
Bug: 68703204
Test: atest DexLoggerIntegrationTests
Change-Id: Ib61cf433ef4729c4e4a0539682b5ddbefdb65575
2018-01-03 11:21:45 +00:00
Joel Fernandes
dc40b9082a Merge "JankBench: make it build and run in Android build" 2017-12-22 20:23:48 +00:00
Joel Fernandes
b5fbd41b23 JankBench: make it build and run in Android build
JankBench is a tool heavily used for scheduler and graphics testing.
JankBench has been an android studio project and traditionally its APK
has been built outside of the Android tree using studio. This patch
makes it possible to build it using Android source tree without needing
studio.

Some library imports needed renaming and an xml file had a typo, also
resource IDs need to be 16-bits so I fixed that up. List fragments can't
be anonymous instantiations anymore so changed it to be non-anonymous.

Bug: 31544438
Test: Run all Jankbench benchmarks manually in the app.
Change-Id: Ib5e4351fcc72acdec20424ae30598c205e7803f7
Signed-off-by: Joel Fernandes <joelaf@google.com>
2017-12-22 20:23:30 +00:00
Philip P. Moltmann
0a6f66e9a9 Merge "Testables lib should not statically link mockito" am: 47d04fc5c0
am: b42cd23425

Change-Id: I7d7096cf24234925256895c3527f44e72cf07493
2017-12-21 19:28:17 +00:00
Treehugger Robot
47d04fc5c0 Merge "Testables lib should not statically link mockito" 2017-12-21 15:27:23 +00:00
Philip P. Moltmann
792bbf66d4 Merge "Testables lib should not statically link mockito" 2017-12-21 15:24:59 +00:00
Philip P. Moltmann
56ff021d50 Testables lib should not statically link mockito
- All users of the lib already statically link mockito
- We should allow the users to decide what flavor they use

Test: m -j checkbuild
Change-Id: Ibbdb8be8022432a13b872865ade47b92b28976c6
Merged-In: Ibbdb8be8022432a13b872865ade47b92b28976c6
2017-12-20 15:41:32 -08:00
Hugo Benichi
824565dfba MacAddress: address api review comments
1) toSafeString() is renamed to toOuiString()
2) toOuiString() returns a String that only contains the first 3 bytes
   of the mac address.

Bug: 70336442
Test: runtest frameworks-net
Change-Id: I798d8fec32dbff5687a682028e5d90eb941f81c1
Merged-In: I798d8fec32dbff5687a682028e5d90eb941f81c1

(cherry pick from commit a0ecf38d30)
2017-12-21 08:34:05 +09:00
Philip P. Moltmann
dadf78987a Testables lib should not statically link mockito
- All users of the lib already statically link mockito
- We should allow the users to decide what flavor they use

Test: m -j checkbuild
Change-Id: Ibbdb8be8022432a13b872865ade47b92b28976c6
2017-12-20 15:32:16 -08:00
Lucas Dupin
660d573e43 Let wallpaper know when to animate AoD transition
Sometimes the screen will blank, and sometime the
wallpaper has the opportunity to animate the
transition.

Bug: 64155983
Test: atest tests/Internal/src/android/service/wallpaper/WallpaperServiceTest.java
Test: atest packages/SystemUI/tests/src/com/android/systemui/doze/DozeWallpaperStateTest.java
Change-Id: Ia92c00edb98eeeba42da33bdc7bec3feb961a658
2017-12-20 13:15:44 -08:00
Philip P. Moltmann
30d2c14006 Merge "Don't include mockito in frameworks-base-testutils" am: f924642729
am: cf7aa7c09e

Change-Id: I6b2486c69af1a05f8282a0d648403522adf2b471
2017-12-20 19:18:45 +00:00
Benedict Wong
413ff10d92 Merge "[ipsec-doze] Add fchown to IpSecService to support doze" am: 4edb4c8ec4 am: 5949912523
am: 53a0c20517

Change-Id: Id6a5ff71ead4566b9a91b9e9b6c78d81f1ac0f54
2017-12-20 18:58:30 +00:00
Treehugger Robot
f924642729 Merge "Don't include mockito in frameworks-base-testutils" 2017-12-20 18:55:14 +00:00
TreeHugger Robot
dfee3c8fd4 Merge "Don't include mockito in frameworks-base-testutils" 2017-12-20 18:49:51 +00:00
Benedict Wong
53a0c20517 Merge "[ipsec-doze] Add fchown to IpSecService to support doze" am: 4edb4c8ec4
am: 5949912523

Change-Id: I9036fc2768dd9664ab7407b359f3c689c7ce700e
2017-12-20 18:42:26 +00:00
Gopinath Elanchezhian
3954230b42 Merge "atest support for app startup test" 2017-12-19 23:36:42 +00:00
Philip P. Moltmann
53e4ae92c7 Don't include mockito in frameworks-base-testutils
So that each test can pick if they want mockito-inline or not.

Test: m -j checkbuild
Change-Id: I1ac02acebbe5cd01f3032a10932a1c612d8d3a4d
Merged-In: I1ac02acebbe5cd01f3032a10932a1c612d8d3a4d
2017-12-19 13:34:59 -08:00
Philip P. Moltmann
9addc597e3 Don't include mockito in frameworks-base-testutils
So that each test can pick if they want mockito-inline or not.

Test: m -j checkbuild
Change-Id: I1ac02acebbe5cd01f3032a10932a1c612d8d3a4d
2017-12-19 13:22:14 -08:00
Benedict Wong
ebf59a8962 Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets" am: d0ac50bcad am: 8caa274ade
am: 9de5c77303

Change-Id: I4140f386687c579044f9b5fe59dd7e05f86000fe
2017-12-19 00:41:55 +00:00
Benedict Wong
9de5c77303 Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets" am: d0ac50bcad
am: 8caa274ade

Change-Id: I2f27c76a1f493ff4f0bd423c06f159e629866d4d
2017-12-19 00:27:57 +00:00
gopinath
165082495d atest support for app startup test
Bug :  b/65842123

Test: App launch test config able to build and install this test
apk in the atest.

Change-Id: I040e299b1e1fdafbcc716f2b0b8b32e7b842de20
2017-12-18 16:10:28 -08:00
Hugo Benichi
fe9e89820d Merge changes I798d8fec,I4a2d5866 am: c5212b6654
am: 99be302c71

Change-Id: I41b507c4e4bf9b8b9082f5e7eaab8985b5bbef41
2017-12-19 00:06:00 +00:00
Benedict Wong
ba8d313efc [ipsec-doze] Add fchown to IpSecService to support doze
Encap sockets are currently created as the system server, and should be
fchown'd to the user for whom it was created on behalf of.

Bug: 62994731
Test: New tests added and run to IpSecService
Change-Id: Icc49e709ae588981e69765fdb77537d7ffbac5fe
2017-12-18 16:01:58 -08:00
Benedict Wong
d0ac50bcad Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets" 2017-12-18 23:50:52 +00:00
Benedict Wong
babe5d7364 [ipsec-qtaguid] Tag sockets upon creation of encap sockets
Added calls to tag encap sockets to that of the UID for which the encap
socket is being created on behalf of. This ensures that all data
accounting generated for the UDP-encap-ESP socket is correctly billed to
the right UID.

Bug: 62994731
Test: New tests added to IpSecServiceTest.java, passing
Change-Id: I15365ea9c982fd7b4e3cdeff314ddfba2289c86e
2017-12-18 19:46:06 +00:00
Lucas Dupin
7517b5dcce Support wallpapers in AoD
Such wallpaper has to define supportsAmbientMode,
and set it to true on its android.service.wallpaper
meta data.

Also introduces WallpaperService.Engine#onAmbientModeChanged
to notify a live wallpaper that the display state has changed.

Change-Id: I49e846069a698b3cc3bb6e7cda98172920eaae4c
Bug: 64155983
Test: runtest -x frameworks/base/packages/SystemUI/tests/src/com/android/systemui/doze/DozeWallpaperStateTest.java
Test: runtest -x frameworks/base/tests/Internal/src/android/app/WallpaperInfoTest.java
Test: runtest -x frameworks/base/tests/Internal/src/android/service/wallpaper/WallpaperServiceTest.java
Test: set AoD wallpaper, go to aod, lock screen, launcher
Test: set regular wallpaper, go to aod, lock screen, launcher
2017-12-18 11:28:16 -08:00
Hugo Benichi
a0ecf38d30 MacAddress: address api review comments
1) toSafeString() is renamed to toOuiString()
2) toOuiString() returns a String that only contains the first 3 bytes
   of the mac address.

Bug: 70336442
Test: runtest frameworks-net
Change-Id: I798d8fec32dbff5687a682028e5d90eb941f81c1
2017-12-18 09:22:47 +09:00
TreeHugger Robot
cc1b3e0e89 Merge "Add android.test.base/stubs dependency" 2017-12-15 23:47:40 +00:00
Paul Duffin
e451de10d6 Add android.test.base/stubs dependency
In preparation for the removal of the non-junit classes in the
android.test.base library from the android.jar this adds a dependency
on android.test.base/stubs to ensure this code will continue to
compile.

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* cmds/uiautomator/instrumentation/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    uiautomator-instrumentation's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* core/tests/hosttests/test-apps/ExternalSharedPerms/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    ExternalSharedPermsTestApp's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* core/tests/hosttests/test-apps/ExternalSharedPermsBT/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    ExternalSharedPermsBTTestApp's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* core/tests/hosttests/test-apps/ExternalSharedPermsDiffKey/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    ExternalSharedPermsDiffKeyTestApp's will need them in order to
    compile once its classes are removed from the current SDK on which
    it currently depends.

* core/tests/hosttests/test-apps/ExternalSharedPermsFL/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    ExternalSharedPermsFLTestApp's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* nfc-extras/tests/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    NfcExtrasTests's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/SurfaceComposition/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    SurfaceComposition's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/WindowAnimationJank/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    WindowAnimationJank's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

Bug: 30188076
Test: make dist
Change-Id: I92b3ff3e5fede3d8d8ecefb0b2e1ee93c5ca9875
2017-12-15 07:37:51 +00:00
Erik Kline
648aee9407 Merge "Revert "Send empty LinkProperties when entering StoppedState."" am: e8a4cb13e9 am: bb8c1a501a
am: 327462b2f7

Change-Id: Ie43fa6ffba91df2d38011d17008c8033ad29cf7b
2017-12-15 07:37:48 +00:00
Erik Kline
327462b2f7 Merge "Revert "Send empty LinkProperties when entering StoppedState."" am: e8a4cb13e9
am: bb8c1a501a

Change-Id: I78bd3c062e9ae89f43dda93ff0d8785cd2cbff70
2017-12-15 07:29:10 +00:00
Erik Kline
e8a4cb13e9 Merge "Revert "Send empty LinkProperties when entering StoppedState."" 2017-12-15 07:09:24 +00:00
Erik Kline
85ca6f75c6 Merge "Send empty LinkProperties when entering StoppedState." am: 5557fe3e2d am: de336f18f9
am: d71ec3be6f

Change-Id: Ie775de7719bedc4fb0d1a50a3be6acad9651a9d9
2017-12-15 06:57:20 +00:00
Erik Kline
d71ec3be6f Merge "Send empty LinkProperties when entering StoppedState." am: 5557fe3e2d
am: de336f18f9

Change-Id: Ida8252c45d7e4680282b49f995fc564cb7227adf
2017-12-15 06:49:11 +00:00
Erik Kline
652044a7db Revert "Send empty LinkProperties when entering StoppedState."
This reverts commit 94209ab768.

Reason for revert: should not have auto-submitted prior to more extensive wifi team testing.

Change-Id: Ie81b10473caf34971226948038bc20dc4fa6a1ae
2017-12-15 06:36:50 +00:00
Treehugger Robot
5557fe3e2d Merge "Send empty LinkProperties when entering StoppedState." 2017-12-15 06:29:15 +00:00
nharold
d569d33ac4 Merge "Fix broken test due to API rename" am: 0abc93177f
am: ee898c81a7

Change-Id: I7e99991cd2c71c66e1acb3aa3957efb28c9a426a
2017-12-14 23:28:16 +00:00
Nathan Harold
05c21d632e Fix broken test due to API rename
A race condition during an Api rename has caused
the name change from reserveSecurityParameterIndex
to allocateSecurityParameterIndex to be wrong in
a test. Fixing.

Bug: 69128142
Test: runtest frameworks-net
Change-Id: I12fb9832cb938dc19f463b1f1124127435d7b173
2017-12-14 23:13:45 +00:00
Nathan Harold
660a335f11 Fix broken test due to API rename
A race condition during an Api rename has caused
the name change from reserveSecurityParameterIndex
to allocateSecurityParameterIndex to be wrong in
a test. Fixing.

Bug: 69128142
Test: runtest frameworks-net
Change-Id: I12fb9832cb938dc19f463b1f1124127435d7b173
2017-12-14 23:04:42 +00:00
nharold
ccb9365019 Merge "Use consistent naming for allocating SPI." am: bf48afea49 am: 4753ed4b1b
am: f71c95dfe4

Change-Id: Ib6845ab0d7f385fbd1d59c0179771542e12c8be0
2017-12-14 21:48:58 +00:00