3605 Commits

Author SHA1 Message Date
Lorenzo Colitti
144223318c DO NOT MERGE: Unbreak TetherInterfaceStateMachineTest.
This was broken by the implementation of IPv6 tethering, which
relies on various private classes which end up calling unmockable
final classes like NetworkInterface.

Making everything public like this is almost certainly not the
best way of fixing this test, but on the other hand there is
value to the test continuing to pass.

Test: runtest frameworks-net  # Everything passes.
Test: IPv6 tethering continues to work.

(cherry picked from commit 7e0eeca8ba4063d0d35dda9a8dfcc612e45efb87)

(cherry picked from commit 5bce5a16b17498981253d7a2d1a490667cd71798)

Change-Id: I3f399188f77fe3e5249443dcb61018a22c29d857
2017-01-18 19:08:07 +09:00
Lorenzo Colitti
2fbc934cd9 DO NOT MERGE: Move the connectivity tests to frameworks/base/tests/net.
This will give us a good place to put all the networking tests.

Fix: 31479480
Test: adb  shell am instrument -w -e notClass com.android.server.connectivity.tethering.TetherInterfaceStateMachineTest 'com.android.frameworks.tests.net/android.support.test.runner.AndroidJUnitRunner'  # PASS

(cherry picked from commit ecc986d430f4b8158f177ed97d2edb741f11ff71)

Change-Id: I4c417c2ba0747d2085169e47ae4a99e93c4d8814
2017-01-18 19:08:05 +09:00
Lorenzo Colitti
073e5e94ad DO NOT MERGE: De-guava BroadcastInterceptingContext and move it to testutils.
Removing the static dependency on guava reduces test compile time
by about 20 seconds on a Z840, thus substantially speeding up the
compile/test cycle.

Make FutureIntent public instead of package-private because it is
used directly by NetworkPolicyManagementServiceTest, which as of
this CL is now in a different package.

(cherry picked from commit 281a17c9580de5c9898be7d9654d428801976511)

Test: runtest frameworks-services -c com.android.server.ConnectivityServiceTest  # PASS
Test: runtest frameworks-services -c com.android.server.NetworkPolicyManagerServiceTest  # PASS
Test: runtest frameworks-services -c com.android.server.net.NetworkStatsServiceTest  # PASS
Test: runtest frameworks-services -c com.android.server.NetworkManagementServiceTest  # Already failing.
Bug: 31479480

(cherry picked from commit 3c295b59f5767904656235db48692906148ab631)

Change-Id: I8a95d4618dced81f173d2b38b9c1dfe3860b348a
2017-01-18 19:08:02 +09:00
Lorenzo Colitti
9997f1489a DO NOT MERGE: Move FakeSettingsProvider to a common location.
(cherry picked from commit 7df1a82802cdf842d07a86a80383c7d5ea7ae53a)

Test: runtest frameworks-util -c com.android.internal.util.test.FakeSettingsProviderTest
Test: runtest frameworks-services -c com.android.server.ConnectivityServiceTest
Test: runtest frameworks-services -c com.android.server.retaildemo.PreloadAppsInstallerTest
Test: runtest frameworks-services -c com.android.server.retaildemo.RetailDemoModeServiceTest
Bug: 31479480

(cherry picked from commit b8df76e413d0b8235d0bd71adf8f368f00391fcb)

Change-Id: Ib82b162f354b8cbb521bc0783556f3225b4d12ac
2017-01-18 19:08:00 +09:00
Erik Kline
7ae809eea6 Merge "Restore legacy types when registering mobile requests" am: 85f67dc60a am: 47453e01cb
am: 1a1a7f6e75

Change-Id: I9eb1ca8a19cca3a28e81392dbd988e5c2cee02c7
2017-01-18 09:51:31 +00:00
Erik Kline
1a1a7f6e75 Merge "Restore legacy types when registering mobile requests" am: 85f67dc60a
am: 47453e01cb

Change-Id: Ic849eb5f85fd835fe4615f5a22afec3e569cf005
2017-01-18 09:46:06 +00:00
Erik Kline
47453e01cb Merge "Restore legacy types when registering mobile requests"
am: 85f67dc60a

Change-Id: I124d28e85711f81216e552bb93dd1994081c9452
2017-01-18 09:41:00 +00:00
Erik Kline
dd8e8911c6 Restore legacy types when registering mobile requests
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - vanilla wifi to mobile tethering (no DUN)
    - tested with DUN by:
        - adding "dun" to the APN type
        - adb shell settings put global tether_dun_required 1
        - verified the bug exists without this fix
Bug: 32163131
Bug: 34364553
Change-Id: Idf1a9a2c8191c40abed29e1789f62aefb83ed1ce
2017-01-18 17:27:31 +09:00
Erik Kline
545049be25 Move tests added in n-mr2 into new aosp location. am: e446acf954 am: 88f3295464
am: 4e9ffd6e91

Change-Id: I3b4f9303c5d4495e4b8556b1db6d5cad5543a10c
2017-01-17 05:19:56 +00:00
Erik Kline
4e9ffd6e91 Move tests added in n-mr2 into new aosp location. am: e446acf954
am: 88f3295464

Change-Id: Iaf574661aa658df1285f69bfad62285bd531206a
2017-01-17 05:08:24 +00:00
Erik Kline
88f3295464 Move tests added in n-mr2 into new aosp location.
am: e446acf954

Change-Id: I69c76aaf4c8d03ce4b33d9c16c47f2c83141e255
2017-01-17 05:01:49 +00:00
Erik Kline
5eba88cf44 Merge "Start of UpstreamNetworkMonitor unittests" am: f9a28d7ba4
am: 4bb6f5a418

Change-Id: I6a9106fd4fef85451104593ab8c37d4539cb9223
2017-01-17 04:51:48 +00:00
Treehugger Robot
5511f7cfc2 Merge "Move tests added in n-mr2 into new aosp location." 2017-01-17 04:49:08 +00:00
Erik Kline
4bb6f5a418 Merge "Start of UpstreamNetworkMonitor unittests"
am: f9a28d7ba4

Change-Id: I2dade79427530a04c8e222e4ab2bf26e79ddd578
2017-01-17 04:46:17 +00:00
Erik Kline
885a9098cf Start of UpstreamNetworkMonitor unittests
Test only the ConnectivityManager request and callback registering
and releasing.  Testing behaviour triggered by activating these
callbacks will be in a separate change.

Test: runtest frameworks-net
Bug: 32163131
Change-Id: Ibfe66bbe2e61d81e8f13ac3b98e000d0d4534efa
2017-01-17 11:08:29 +09:00
Erik Kline
e446acf954 Move tests added in n-mr2 into new aosp location.
Test: runtest frameworks-net
Change-Id: I3ca0d7e01a3f31be05d4a1a72a95c7e37a0a567e
2017-01-16 15:24:31 +09:00
Hugo Benichi
4e1619f034 ConnectivityServiceTest: some fixes in CallbackInfo
- CallbackInfo becomes a static class so that it can be instantiated
  and looked at more easily than before.
- CallbackInfo gains hashCode() because it has equals().
- effectively final field are qualified final
- fixes bug when polling the next callback: poll() on a LinkedBlockingQueue
  returns null when timing out, which was not failing the test cleanly.

Test: ConnectivityServiceTest passes
Bug: 32561414
Change-Id: I64d382a35fe83f21bded98e6906c1ec70a8f1085
2017-01-16 11:15:04 +09:00
Hugo Benichi
cfcc1cb7bf DO NOT MERGE: frameworks-test: adding missing @SmallTest
This activates all frameworks-test tests in runs of the continuous
platform tests.

Test: $ runtest frameworks-net passes (expect Tether
Bug: 32561414
(cherry picked from commit fa8a6f6220d1a0027ba7969c2d3f72690ddc6495)

Change-Id: I7b0706a7e3368f971d508388e8ad4afc5de9d646
2016-12-09 14:35:05 +09:00
Hugo Benichi
5d0f28c7fd DO NOT MERGE: Netd events: record connect() success/errno
Test: $ runtest frameworks-net pass
Bug: 32198976

(cherry picked from commit 8b06bcdfd24100302818ae0e11ee751dd813d5cf)
2016-12-09 14:34:39 +09:00
Tony Mak
de7f7d195e DO NOT MERGE: Show notification for always-on app VPN
This is the same notification as the one shown during legacy lockdown
mode, sans the 'reset' button.

The notification is only shown during times when VPN has not yet
established or has failed, for example during boot or after a crash.

Bug: 29123115

(cherry picked from commit 1a405fe300950d6ceae2166fd074b596d8110dbe)

Change-Id: I929a05c24df01e21415535a333bb14ac4b790a9d
2016-12-09 14:23:10 +09:00
Hugo Benichi
02428988ad DO NOT MERGE: APF: also drop any ICMPv6 RSs
Test: new unit test + $ runtest franeworks-net
Bug: 32833400

(cherry picked from commit f98182ef5e80ede5de7f2c2a5f40fc92a46c9704)

Change-Id: Ifaf6e778c811c7d865c790a293b1fce3f43cad1c
2016-12-09 13:59:19 +09:00
Hugo Benichi
53d83d5142 DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings
This patch introduces an assertEventuallyThat helper function in
ConnectivityServiceTest which given a boolean function retries until the
function returns true or until a maximum retry time is reached.

This function is used to fix flakyness of testAvoidBadWifiSetting where
the Message posted by reevaluate() could reach the Handler's
MessageQueue after waitForIdle takes effect, resulting in the test to
fail.

Instead of fixing the flakyness by introdcing hard sleep times,
assertEventuallyThat is used to reduce the overall test time.

With this change the test has been observed to pass with 100% success
rate over 50000 invocations.

Test: $ runtest frameworks-net
Bug: 32561414

(cherry picked from commit 99c8294ef0c7a720364abb5884063e0a9d1bb5fe)

Change-Id: If41a24989d5f65aeb439f68741f511b5eb53b18d
2016-12-09 13:59:19 +09:00
Hugo Benichi
cbf8ff83a8 DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark
This patch fixes flakyness of testRequestBenchmark by adjusting time
limit for callback registration from 100ms to 180ms, and time limits for
onAvailable and onLost triggers from 30ms to 40ms.

With these timeouts the test succeeds 100% over 5000 iterations.

When using 150ms for registration timeout, running the test 5000 times
fails 2 times.

When using 30ms for onLost timeout, running the test 5000 times fails
1 times.

In addition, this patch also cleans testRequestBenchmark and uses the
more stable SystemClock.elapsedRealtime() for duration measurements.

Test: $ runtest frameworks-net
Bug: 32561414

(cherry picked from commit 38be57b438a0c1754091f045317db2049304e16f)

Change-Id: I196ab9ef7f5abe456a783eed65db09279d2ecb8c
2016-12-09 13:59:18 +09:00
Hugo Benichi
f99a33a1b4 DO NOT MERGE: IpConnectivityMetrics: rate limit ApfProgramEvents
This patch uses the previously introduced TokenBucket to rate limit
ApfProgramEvents, still allowing for burst of ApfProgramEvents when a
new interface is set up (due to ipv4 provisioning, multicast lock, ipv6 RAs
triggering new APF program events in short amounts of time).

Test: new test in IpConnectivityMetricsTest
Bug: 1550402

(cherry picked from commit e1c173d2240a8eedf7685c9371087dc047a6931f)

Change-Id: Idb640dec13ba64180985544b9709a586af66eb6e
2016-12-09 11:21:31 +09:00
Hugo Benichi
8c9e4b68f0 DO NOT MERGE: IpConnectivityMetrics reads buffer size in settings
Test: IpConnectivityMetricsTest passes. Also manually changed the new
setting and verified the buffer size is as expected after flushing the
buffer.
Bug: 32198637

(cherry picked from commit 05686dbb6b965eb1a54591d2ed2334337886c6ee)

Change-Id: Iefbeac3a688b260fb3f92dfe0bfd9db28e26749d
2016-12-09 11:21:26 +09:00
Hugo Benichi
9df2ae138b DO NOT MERGE: IpConnectivity metrics: add version number
This patch adds a version field to ipconnectivity.proto and populates it
to 2, which is the logical version number for NYC-MR2.

Test: IpConnectivity{EventBuilder,Metrics}Test pass
Bug: 32127906

(cherry picked from commit d680d4c856f54bea0c60dea74ba4204822391e49)

Change-Id: If8f167c0dc4c1abe0e235e2adfd131168a4ddc52
2016-12-09 11:21:11 +09:00
Etan Cohen
bf3b1bad15 DO NOT MERGE: [CS] Remove timeout event after first available
Guarantees that timeouts are only delivered if a network never
becomes available. Once a network is available the timeout is
canceled.

Bug: 31402633
Test: all timeout related unit tests pass (new one added)

(cherry picked from commit 681fcda5896fd6c94f8a543ef9983c0a0644e87e)

Change-Id: I7cd3086544c881915fc6dbf14b87a24ab0cd8748
2016-12-08 17:13:37 +09:00
Hugo Benichi
5d2654124e DO NOT MERGE: ApfTest: tag tests with @SmallTest or @MediumTest
Test methods not tagged with @{Small,Medium,Large}Test will not appear
in the Android Platform Continuous Testing dashboard.

Test methods tagged with @LargeTest will not be run in the Android
Platform Continuous Testing dashboard.

Test: ApfTest passes ($runtest frameworks-net)
Bug: 31479480

(cherry picked from commit 4195c28347cc100954f83c3c92b4dde4673f8608)

Change-Id: Ia215fc8e2ccc61f6223c24fdf390e1e759de302f
2016-12-08 17:13:36 +09:00
Lorenzo Colitti
5bce5a16b1 DO NOT MERGE: Unbreak TetherInterfaceStateMachineTest.
This was broken by the implementation of IPv6 tethering, which
relies on various private classes which end up calling unmockable
final classes like NetworkInterface.

Making everything public like this is almost certainly not the
best way of fixing this test, but on the other hand there is
value to the test continuing to pass.

Test: runtest frameworks-net  # Everything passes.
Test: IPv6 tethering continues to work.

(cherry picked from commit 7e0eeca8ba4063d0d35dda9a8dfcc612e45efb87)

Change-Id: I8a3cf466871c026f4ae0f5cfa73071338cdf5b7e
2016-12-08 17:13:36 +09:00
Lorenzo Colitti
7ceef950a0 DO NOT MERGE: Move the connectivity tests to frameworks/base/tests/net.
This will give us a good place to put all the networking tests.

Fix: 31479480
Test: adb  shell am instrument -w -e notClass com.android.server.connectivity.tethering.TetherInterfaceStateMachineTest 'com.android.frameworks.tests.net/android.support.test.runner.AndroidJUnitRunner'  # PASS

(cherry picked from commit ecc986d430f4b8158f177ed97d2edb741f11ff71)

Change-Id: I993eeaa5dec001c39389023f355f506129b356e7
2016-12-08 17:13:35 +09:00
Lorenzo Colitti
3c295b59f5 DO NOT MERGE: De-guava BroadcastInterceptingContext and move it to testutils.
Removing the static dependency on guava reduces test compile time
by about 20 seconds on a Z840, thus substantially speeding up the
compile/test cycle.

Make FutureIntent public instead of package-private because it is
used directly by NetworkPolicyManagementServiceTest, which as of
this CL is now in a different package.

(cherry picked from commit 281a17c9580de5c9898be7d9654d428801976511)

Test: runtest frameworks-services -c com.android.server.ConnectivityServiceTest  # PASS
Test: runtest frameworks-services -c com.android.server.NetworkPolicyManagerServiceTest  # PASS
Test: runtest frameworks-services -c com.android.server.net.NetworkStatsServiceTest  # PASS
Test: runtest frameworks-services -c com.android.server.NetworkManagementServiceTest  # Already failing.
Bug: 31479480
Change-Id: Ifab32c9214e9caab71dbf93b3d3ca88df6f49636
2016-12-08 17:13:35 +09:00
Lorenzo Colitti
b8df76e413 DO NOT MERGE: Move FakeSettingsProvider to a common location.
(cherry picked from commit 7df1a82802cdf842d07a86a80383c7d5ea7ae53a)

Test: runtest frameworks-util -c com.android.internal.util.test.FakeSettingsProviderTest
Test: runtest frameworks-services -c com.android.server.ConnectivityServiceTest
Test: runtest frameworks-services -c com.android.server.retaildemo.PreloadAppsInstallerTest
Test: runtest frameworks-services -c com.android.server.retaildemo.RetailDemoModeServiceTest
Bug: 31479480
Change-Id: I8d4d4de2937012dd33924f53e68f96241a9b2b4f
2016-12-08 17:13:34 +09:00
John Reck
579e3667e3 DO NOT MERGE: Add TouchLatency test
am: 91e2e7f460

Change-Id: I1eeed0e4aea8dbe2d963b38cfe9d79449e1a17d2
2016-12-06 20:13:49 +00:00
John Reck
91e2e7f460 DO NOT MERGE: Add TouchLatency test
Change-Id: Ic3a788f6b06bf6477ab23b183fb8c76ae8870b6b
(cherry picked from commit d136ce902c0be4a0cfb8e9d1288ba931ceaf88b4)
2016-12-06 01:23:43 +00:00
Chris Craik
bb6491755b Slow RecyclerView item binding benchmark am: 58427a62ac
am: 3346f28b28

Change-Id: I65f2f0f35e887171d271a7c25b687ed57cfd219d
2016-09-16 22:24:06 +00:00
Chris Craik
3346f28b28 Slow RecyclerView item binding benchmark
am: 58427a62ac

Change-Id: I55d2333c4630fd539d9fdc22a15023e5f4d8c25c
2016-09-16 22:15:31 +00:00
Chris Craik
58427a62ac Slow RecyclerView item binding benchmark
bug:27106058
bug:31063101

Change-Id: Ib903a31be707ba16fccf95cbbe24cd0f0b3baee3
2016-09-13 14:45:53 -07:00
Teng-Hui Zhu
4ad89dafb2 Remove redundant code am: 4ebc5986a8
am: 82907dfd36

Change-Id: Ia55faf872466f837ea1b7c327ffc30590d781d60
2016-09-02 17:53:59 +00:00
Teng-Hui Zhu
4ebc5986a8 Remove redundant code
This can save both system image size and run time memory usage.
Every byte counts. :)

b/30956516

Change-Id: I1af0455fe488e3122f6cf8e8fca5a5a43a4614f2
2016-08-31 14:30:37 -07:00
Yuanlang Song
4dadfe9e72 Work around to get ride of NPE in app startup test am: eaf08cf7d0
am: 832ec72c38

Change-Id: Ia06a591cec41b2546d99411e51741bfdbe5c7886
2016-08-02 00:50:19 +00:00
Yuanlang Song
eaf08cf7d0 Work around to get ride of NPE in app startup test
bug: 30374599
Change-Id: I9050ba6ac6283734c345e4e7f9f56f34e1477c7a
2016-08-01 12:11:57 -07:00
Chris Craik
afc5673bdb Merge \"Fix ShadowGrid in UiBench\" into nyc-mr1-dev
am: 0c05a3dd1c

Change-Id: Ib0bdaa1f80e05f6409cbeb643e0708fac684b097
2016-07-14 02:18:58 +00:00
Chris Craik
5d2a453ab4 Fix ShadowGrid in UiBench
fixes: 30013642

Refactor Fragment to not be anonymous, support lib hates those.

Change-Id: Ia0e282b4b5ff7abf1a50b42ad2497d3c3344ccbc
(cherry picked from commit 9f0fa995c57cedf4e4a707955e55e17ea9116ffe)
2016-07-13 16:00:10 -07:00
Chris Thornton
1a4507cb8e Merge \"Fix a few log messages that didn\'t have a space in the SoundTriggerTestApp\" into nyc-mr1-dev
am: ea7999dc3f

Change-Id: I27952804de098e92c50907d47198dd747f272e31
2016-07-13 02:09:12 +00:00
Chris Thornton
2d2ba9d089 Fix a few log messages that didn't have a space in the SoundTriggerTestApp
Change-Id: If3b5ac6533429843d4be733bd31f2bb83e1d5971
2016-07-12 17:16:42 -07:00
Gopinath Elanchezhian
c6696ae7a6 Merge \\"App launch - Test app changes\\" into nyc-dev am: 8fabbb89c0
am: 2b6700a27b

Change-Id: Idb5094bfaab92982890c13dc9639ab45480acad6
2016-07-12 16:27:09 +00:00
Gopinath
8c5eb63835 Merge \"App launch - Test app changes\" into nyc-dev
am: 8fabbb89c0

Change-Id: I0b14fe4a4dd9414d9fe9d15980e8058a7b3d9e29
2016-07-12 16:11:01 +00:00
Gopinath
2b6700a27b Merge \"App launch - Test app changes\" into nyc-dev
am: 8fabbb89c0

Change-Id: I304e8791b2ea72bd527fa0c8abd2c748c90e866c
2016-07-12 16:09:18 +00:00
Gopinath Elanchezhian
8fabbb89c0 Merge "App launch - Test app changes" into nyc-dev 2016-07-12 16:02:43 +00:00
Chris Craik
0fc003e675 Merge \"Fix UiBench MainActivity fragment\" into nyc-mr1-dev
am: 8b31db3621

Change-Id: I597e28d025569fec839ca7b02ea03b054a582a94
2016-07-09 00:37:54 +00:00