Commit Graph

1150 Commits

Author SHA1 Message Date
Chris Manton
da59f89ae4 Merge "Include Wear device idle settings am: 1ac3a1f3fc" am: afae7a6e23 am: f60a65f816 am: f8cd2e64be
am: e68295db9e

Change-Id: I1050da791fb350b3e4d5ab743c7542739e4846e3
2017-02-03 01:02:13 +00:00
Chris Manton
e68295db9e Merge "Include Wear device idle settings am: 1ac3a1f3fc" am: afae7a6e23 am: f60a65f816
am: f8cd2e64be

Change-Id: Ide4d5573fd5d70b8b8875f22a84d6ee155a0e7ea
2017-02-03 00:25:54 +00:00
Chris Manton
f8cd2e64be Merge "Include Wear device idle settings am: 1ac3a1f3fc" am: afae7a6e23
am: f60a65f816

Change-Id: Ic42a559bf5e57128919ae9747f58c3cdf83b804e
2017-02-03 00:18:02 +00:00
Chris Manton
f60a65f816 Merge "Include Wear device idle settings am: 1ac3a1f3fc"
am: afae7a6e23

Change-Id: Ief16fa1d0029f9e60c59b3d551f6fe7b27528a17
2017-02-03 00:12:32 +00:00
Chris Manton
81d5870154 Include Wear device idle settings
am: 1ac3a1f3fc

Change-Id: Iea4eb54b1baa1df7a7eb680bd51db8bbdb237ce4
2017-02-03 00:00:35 +00:00
Android Build Merger (Role)
5ddc00fa5b Merge "Merge "Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master" am: d26b43b4d5 am: 84cde9eb08 am: 289e9873ea am: 615b8de254" 2017-02-02 16:50:04 +00:00
Marco Nelissen
88a89e50a4 Merge "Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master" am: d26b43b4d5 am: 84cde9eb08 am: 289e9873ea
am: 615b8de254

Change-Id: I7f305217fbdc23092d6b70efe553d5648fb60e50
2017-02-02 16:49:38 +00:00
Android Build Merger (Role)
b81e65e206 Merge "Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master am: 8653b32a48 am: bce78b316b am: 6b68e48c46 am: 4c45dd89df" 2017-02-02 16:49:25 +00:00
Marco Nelissen
d3f9fb62fe Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master am: 8653b32a48 am: bce78b316b am: 6b68e48c46
am: 4c45dd89df

Change-Id: I41707e5666b7c86e629bec80a69a900d6bc510b4
2017-02-02 16:49:04 +00:00
The Android Automerger
b1a558197e Manually merge commit '4c45dd89df'
* commit '4c45dd89df':

BUG:34928041
2017-02-02 16:47:01 +00:00
Marco Nelissen
615b8de254 Merge "Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master" am: d26b43b4d5 am: 84cde9eb08
am: 289e9873ea

Change-Id: I7471a5ba1d531b118a26545c7d1fc4dc538a1507
2017-02-02 03:31:01 +00:00
Marco Nelissen
4c45dd89df Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master am: 8653b32a48 am: bce78b316b
am: 6b68e48c46

Change-Id: Ic3c51b17d6425ec27f43a2fb486602c3da03a872
2017-02-02 03:30:26 +00:00
Marco Nelissen
289e9873ea Merge "Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master" am: d26b43b4d5
am: 84cde9eb08

Change-Id: Ie189450dabdb837096872b54c425458d9eeb7726
2017-02-02 03:27:55 +00:00
Marco Nelissen
6b68e48c46 Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master am: 8653b32a48
am: bce78b316b

Change-Id: I45c0a02a71c774ae16420bc9d1edf5785b496a41
2017-02-02 03:27:24 +00:00
Marco Nelissen
84cde9eb08 Merge "Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master"
am: d26b43b4d5

Change-Id: I3c9a96bd2f82c4261f235f77dccd3878682d1dca
2017-02-02 03:22:29 +00:00
Marco Nelissen
bce78b316b Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master
am: 8653b32a48

Change-Id: I4fe72e7f2d6d8ed75ce8f36234c89cc8f7306ed1
2017-02-02 03:22:24 +00:00
Marco Nelissen
d26b43b4d5 Merge "Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master" 2017-02-02 03:18:14 +00:00
Geoffrey Pitsch
d5eadafa77 All cts uses notification channels and new Builder constructor
Test: ran cts for all *Test.java files in CL
Change-Id: I62f6eae53b539a1cfc79a05a2aa4070bf30fbfc0
2017-01-31 16:02:32 -05:00
Chris Manton
1ac3a1f3fc Include Wear device idle settings
Certain tests interacting with device idle
must set correctly both the normal and wear
device idle setting space.

Bug: 32183373

Test: Run on wear device and Nexus6P
run cts --skip-device-info -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testDozeModeMetered_enabledButWhitelistedOnNotificationAction
run cts --skip-device-info -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testDozeModeNonMetered_enabledButWhitelistedOnNotificationAction

Change-Id: I6a53d29021a7d4a257b102a4d3bd5d2cc845c16f
2017-01-30 12:26:09 -08:00
Paul Stewart
d4b573d247 Merge "Add CTS test for client certificate chains" am: 1663359290 am: 15504e6509 am: 59f642b278
am: e951221c2c

Change-Id: I524bb68f330aadfa2a4dda5b7b4857fd4a715576
2017-01-30 18:22:46 +00:00
Paul Stewart
e951221c2c Merge "Add CTS test for client certificate chains" am: 1663359290 am: 15504e6509
am: 59f642b278

Change-Id: I24d7855dd2f90cd68592c3ae2465cd0c664a7cc1
2017-01-30 18:19:15 +00:00
Paul Stewart
59f642b278 Merge "Add CTS test for client certificate chains" am: 1663359290
am: 15504e6509

Change-Id: Iaf3cc041583a5dbc15130e795289aabbca912b8f
2017-01-30 18:15:14 +00:00
Treehugger Robot
1663359290 Merge "Add CTS test for client certificate chains" 2017-01-30 18:08:27 +00:00
Roshan Pius
e94eb6df5c Merge "WifiManagerTest: |disableOthers| flag change" am: aaaca1cfc8 am: 76b4b52522 am: d434b47f1e
am: 9574de7d88

Change-Id: I2071a0e4939c39b2f2defa4cdd8452d9cc2c87c7
2017-01-27 23:44:36 +00:00
Roshan Pius
9574de7d88 Merge "WifiManagerTest: |disableOthers| flag change" am: aaaca1cfc8 am: 76b4b52522
am: d434b47f1e

Change-Id: I1b1bffd06d41f7a0037a41c28018043777313ab7
2017-01-27 23:34:58 +00:00
Roshan Pius
d434b47f1e Merge "WifiManagerTest: |disableOthers| flag change" am: aaaca1cfc8
am: 76b4b52522

Change-Id: I8afe4aab7b34565ec5eac7ea274065d38aeb0696
2017-01-27 23:32:26 +00:00
Treehugger Robot
aaaca1cfc8 Merge "WifiManagerTest: |disableOthers| flag change" 2017-01-27 23:24:24 +00:00
Marco Nelissen
8653b32a48 Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master
Test: built
Merged-In: I0e9438d5fdb01c94077aa22cdf402dee8bf5ec97
Change-Id: Idbd20b12eec0440369b37316f9ab2c84978f7725
2017-01-27 23:14:25 +00:00
Paul Stewart
9f295aaa43 Add CTS test for client certificate chains
Add tests to excercise new WifiEnterpriseConfig methods, including
setClientKeyEntryWithCertificateChain, and the new getters related
to it.

Bug: 34688653
Test: This is a test
Change-Id: I183166f5864c5ec77eb8590e2e0f521bbc7a39e7
2017-01-27 11:48:29 -08:00
Roshan Pius
446ca6fd2a WifiManagerTest: |disableOthers| flag change
Change the CTS test to reflect the change in behaviour of the
|disableOthers| flag in WifiManager.enableNetwork(). This will now just
be used as an indication to trigger connection to the specified network
instead of disabling all other configured networks.

Bug: 34765254
Test: Compiles
Change-Id: I97a5a84bb861e289d966552cea7f36d7dd4fd090
2017-01-27 18:54:55 +00:00
George Burgess IV
f4cbea5f14 Merge "Replace strlen("foo") with sizeof("foo") - 1." am: a17d71f60a am: 386431a28c am: f7ce609edb
am: 6e8d9121d4

Change-Id: I72070a855929beb195058a3576fb1dfdf9761322
2017-01-26 22:07:08 +00:00
George Burgess IV
6e8d9121d4 Merge "Replace strlen("foo") with sizeof("foo") - 1." am: a17d71f60a am: 386431a28c
am: f7ce609edb

Change-Id: Ica1b820deed1f511e1557a6c9d49d8e375b68812
2017-01-26 22:03:05 +00:00
George Burgess IV
f7ce609edb Merge "Replace strlen("foo") with sizeof("foo") - 1." am: a17d71f60a
am: 386431a28c

Change-Id: I84aafb1fa79b7d16261d96a583348c0ad6bd044b
2017-01-26 21:59:05 +00:00
Treehugger Robot
a17d71f60a Merge "Replace strlen("foo") with sizeof("foo") - 1." 2017-01-26 21:49:09 +00:00
George Burgess IV
32599fd50c Replace strlen("foo") with sizeof("foo") - 1.
We have an upcoming change to Bionic that no longer allows us to treat
strlen("foo") as a constant expression, which causes this bit of code to
no longer compile. So, we need to either use __builtin_strlen("foo") or
sizeof("foo") - 1 instead. (Note that the *optimizer* can still turn it
into a constant, but optimization happens after we figure out if
something is actually a constant expression or not.)

sizeof("foo") is used elsewhere in this file, so I just went with that.

Bug: 32073964
Test: Now builds.
Change-Id: I2797ee75fd114e237de8e97c50549763c88f73f4
2017-01-25 19:20:09 +00:00
Paul Duffin
09801ea6e5 Merge "Prepare for removal of legacy-test from default targets" am: 777c5a3ea1 am: 2d7a0786b5 am: 42f777bbb6 -s ours
am: 3a504e398d  -s ours

Change-Id: Ifc6b84aa908ee3475713a46cdb3d0dc9ea85e52b
2017-01-20 14:27:04 +00:00
Paul Duffin
3a504e398d Merge "Prepare for removal of legacy-test from default targets" am: 777c5a3ea1 am: 2d7a0786b5
am: 42f777bbb6  -s ours

Change-Id: I4af92835d0d5dd7b86d38406636caa723a69f277
2017-01-20 14:25:02 +00:00
Paul Duffin
42f777bbb6 Merge "Prepare for removal of legacy-test from default targets" am: 777c5a3ea1
am: 2d7a0786b5

Change-Id: I3d450f4890825f5ad261b01ae9bd1a1b01a640c7
2017-01-20 14:05:29 +00:00
Treehugger Robot
777c5a3ea1 Merge "Prepare for removal of legacy-test from default targets" 2017-01-20 13:59:18 +00:00
Paul Duffin
d872302cdb Prepare for removal of legacy-test from default targets
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.

Bug: 30188076
Test: make checkbuild
Merged-In: I0f34fe97154240e8f8eef6816df1c794da60351e
Change-Id: I7e3b028321c42b7427d79365eb3f51ddf896f930
2017-01-20 11:38:45 +00:00
Paul Duffin
038b6a4374 Prepare for removal of legacy-test from default targets
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.

Bug: 30188076
Test: make checkbuild
Change-Id: I0f34fe97154240e8f8eef6816df1c794da60351e
2017-01-20 11:22:59 +00:00
Glen Kuhne
23c37e3517 Merge "CTS: WifiManager.addNetwork with HttpProxy" am: b99788eb24 am: 155a81349f am: 968719035d
am: bf085108dc  -s ours

Change-Id: I62b74e0d2b5d7eedd90016a8d766f3c34153f8a4
2017-01-18 22:08:17 +00:00
Glen Kuhne
bf085108dc Merge "CTS: WifiManager.addNetwork with HttpProxy" am: b99788eb24 am: 155a81349f
am: 968719035d

Change-Id: Id70c0b0c95edf0615400cfe59f089d9411d48d12
2017-01-18 18:51:48 +00:00
Glen Kuhne
968719035d Merge "CTS: WifiManager.addNetwork with HttpProxy" am: b99788eb24
am: 155a81349f

Change-Id: I0b4f12d41263db0fd69cce933af915f46fa3ff31
2017-01-18 18:24:45 +00:00
Glen Kuhne
1b93dea624 CTS: WifiManager.addNetwork with HttpProxy
Added CTS tests verifying, that adding a WifiConfiguration containing an
httpProxy will:
-Succeed if caller is DeviceOwner
-Fail if caller is not DeviceOwner

Test: Added two CTS tests
Bug: 14669153
Change-Id: I2c81492dba5052117a03a2aa7b3cc8ffb5d52d5f
Merged-In: I2c81492dba5052117a03a2aa7b3cc8ffb5d52d5f
2017-01-17 15:33:48 -08:00
Glen Kuhne
6f819908c3 Merge "CTS: WifiManager.addNetwork with HttpProxy" 2017-01-17 21:38:31 +00:00
Glen Kuhne
55e97317e9 CTS: WifiManager.addNetwork with HttpProxy
Added CTS tests verifying, that adding a WifiConfiguration containing an
httpProxy will:
-Succeed if caller is DeviceOwner
-Fail if caller is not DeviceOwner

Test: Added two CTS tests
Bug: 14669153
Change-Id: I2c81492dba5052117a03a2aa7b3cc8ffb5d52d5f
2017-01-17 10:53:25 -08:00
Neil Fuller
4b41bfc741 Merge "Add test for LocalSockets created from a FileDescriptor" am: fc8bbf5ceb am: abc0e7765d am: 6a89797685
am: 29ac7bce15

Change-Id: Iacbd3bfff156a3e18b3ce91c7c7ad99d2f891d4d
2017-01-11 15:37:34 +00:00
Neil Fuller
29ac7bce15 Merge "Add test for LocalSockets created from a FileDescriptor" am: fc8bbf5ceb am: abc0e7765d
am: 6a89797685

Change-Id: I5920cae112e2083e1f58408cda6a257ad95fb0bc
2017-01-11 13:53:17 +00:00
Neil Fuller
6a89797685 Merge "Add test for LocalSockets created from a FileDescriptor" am: fc8bbf5ceb
am: abc0e7765d

Change-Id: Ia1ef9e648c7afa55406793803f579db90844e864
2017-01-11 13:47:20 +00:00