Roshan Pius
e94eb6df5c
Merge "WifiManagerTest: |disableOthers| flag change" am: aaaca1cfc8 am: 76b4b52522 am: d434b47f1e
...
am: 9574de7d88
2017-01-27 23:44:36 +00:00
Roshan Pius
9574de7d88
Merge "WifiManagerTest: |disableOthers| flag change" am: aaaca1cfc8 am: 76b4b52522
...
am: d434b47f1e
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
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
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
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
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
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
2017-01-18 22:08:17 +00:00
Glen Kuhne
bf085108dc
Merge "CTS: WifiManager.addNetwork with HttpProxy" am: b99788eb24 am: 155a81349f
...
am: 968719035d
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
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
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
Neil Fuller
a3577f20f2
Add test for LocalSockets created from a FileDescriptor
...
Adding a test to catch future regressions with this code
path.
Bug: 34095140
Test: vogar --mode app_process tests/tests/net/src/android/net/cts/LocalSocketTest.java
Change-Id: I648ed87d4b9e7fa25787c150f08351c6faf55496
2017-01-06 14:16:22 +00:00
Neil Fuller
94fdf3394c
Merge "Add more assertions related to LocalServerSocket.accept()" am: 863ff4a2cb am: a0c574dcc7 am: 0c14426eac
...
am: ca6100ad5f
2017-01-04 12:50:42 +00:00
Neil Fuller
ca6100ad5f
Merge "Add more assertions related to LocalServerSocket.accept()" am: 863ff4a2cb am: a0c574dcc7
...
am: 0c14426eac
2017-01-04 12:44:06 +00:00
Neil Fuller
0c14426eac
Merge "Add more assertions related to LocalServerSocket.accept()" am: 863ff4a2cb
...
am: a0c574dcc7
Change-Id: I90164b0ee1b7301fd4f99c530fd6f7159aba780c
2017-01-04 12:37:43 +00:00
Neil Fuller
d9e98a6688
Add more assertions related to LocalServerSocket.accept()
...
The isConnected() / isBound() behavior is new, the behavior
when bind() / connect() is called is not. See related
frameworks/base changes.
Test: Tests run under vogar.
Bug: https://code.google.com/p/android/issues/detail?id=35942
Change-Id: I8577212270f3b3e76ea015914eebddc0fe4a6afa
2017-01-04 10:40:36 +00:00
Tina Zhou
0c19cd9924
Merge "merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: e58548f27f -s ours am: b7086e2c4f am: c3a819d061 am: eef36c9a9d" into nyc-mr2-dev-plus-aosp
...
am: 11491e3568
2016-12-17 01:08:48 +00:00
Tina Zhou
4f282008e4
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: e58548f27f -s ours am: b7086e2c4f am: c3a819d061 am: eef36c9a9d
...
am: 3c7cc1ba8e
2016-12-17 01:08:45 +00:00
Tina Zhou
c3771a1606
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: e58548f27f -s ours am: b7086e2c4f am: c3a819d061 am: 87bba74f63
...
am: 406b12a3a0
2016-12-17 01:08:18 +00:00
Android Build Merger (Role)
11491e3568
Merge "merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: e58548f27f -s ours am: b7086e2c4f am: c3a819d061 am: eef36c9a9d" into nyc-mr2-dev-plus-aosp
2016-12-17 00:59:38 +00:00
Tina Zhou
3c7cc1ba8e
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: e58548f27f -s ours am: b7086e2c4f am: c3a819d061
...
am: eef36c9a9d
2016-12-17 00:59:17 +00:00
Tina Zhou
406b12a3a0
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: e58548f27f -s ours am: b7086e2c4f am: c3a819d061
...
am: 87bba74f63
Change-Id: Ib1cd2a6561b68e782e8c39bdf2a31ae0ca69f976
2016-12-17 00:59:17 +00:00
Tina Zhou
eef36c9a9d
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: e58548f27f -s ours am: b7086e2c4f
...
am: c3a819d061
2016-12-17 00:50:16 +00:00
Tina Zhou
c3a819d061
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: e58548f27f -s ours
...
am: b7086e2c4f
2016-12-17 00:41:16 +00:00
Tina Zhou
b7086e2c4f
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev
...
am: e58548f27f
2016-12-17 00:32:46 +00:00
Yu Liu
b5a364bf7d
Merge "merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 73eee30ffe am: 7cd9930f4b am: d7f8755fd5 am: 0170919a9b" into nyc-mr2-dev-plus-aosp
...
am: 0569ab366c
2016-12-16 22:51:40 +00:00
Yu Liu
f140d2b7e4
merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 73eee30ffe am: 7cd9930f4b am: d7f8755fd5 am: 0170919a9b
...
am: 1087edb3a9
2016-12-16 22:51:37 +00:00
Yu Liu
9b882fd0f9
merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 73eee30ffe am: 7cd9930f4b am: d7f8755fd5 am: e19332fe41
...
am: 56ba301912
2016-12-16 22:50:53 +00:00
Android Build Merger (Role)
0569ab366c
Merge "merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 73eee30ffe am: 7cd9930f4b am: d7f8755fd5 am: 0170919a9b" into nyc-mr2-dev-plus-aosp
2016-12-16 22:43:09 +00:00
Yu Liu
1087edb3a9
merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 73eee30ffe am: 7cd9930f4b am: d7f8755fd5
...
am: 0170919a9b
2016-12-16 22:42:52 +00:00
Yu Liu
56ba301912
merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 73eee30ffe am: 7cd9930f4b am: d7f8755fd5
...
am: e19332fe41
Change-Id: I62c44da71daaf577893b67feb31ecf422ec42531
2016-12-16 22:42:39 +00:00
Yu Liu
0170919a9b
merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 73eee30ffe am: 7cd9930f4b
...
am: d7f8755fd5
2016-12-16 22:34:37 +00:00
Yu Liu
d7f8755fd5
merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 73eee30ffe
...
am: 7cd9930f4b
2016-12-16 22:25:38 +00:00
Yu Liu
7cd9930f4b
merge in nyc-mr1-release history after reset to nyc-mr1-dev
...
am: 73eee30ffe
Change-Id: I32635801fa4338f313feef7655c7636253d708d3
2016-12-16 22:17:04 +00:00
Aaron Holden
37698cb72b
Move libs/deviceutil to device-side/util
...
Test: build cts, run unit tests
bug:21762834
Change-Id: Ifd164ced7f040e312e3553f27adf59a648f463ab
2016-12-12 12:27:20 -08:00
gitbuildkicker
e58548f27f
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev
2016-11-30 16:55:24 -08:00
