Hugo Benichi
01432b306d
resolve merge conflicts of 9355bce0c323 to master
...
Test: none
Change-Id: Iac65e01d07edf79ec97e7d996f8cfee6f811606b
2017-02-17 10:47:58 +09:00
Hugo Benichi
9355bce0c3
Merge "IP connectivity metrics: delete obsolete logger service" am: 37e3f22c2e am: c54962a4bd
...
am: 9c2b6afa2f
Change-Id: I5f8cd508812d9532778c2f1f019308a4b8d8ee33
2017-02-17 00:18:35 +00:00
Hugo Benichi
9c2b6afa2f
Merge "IP connectivity metrics: delete obsolete logger service" am: 37e3f22c2e
...
am: c54962a4bd
Change-Id: Iccc3ee97bd2ac267b312c6c7d9269ac02a2bd68e
2017-02-17 00:09:11 +00:00
Hugo Benichi
c54962a4bd
Merge "IP connectivity metrics: delete obsolete logger service"
...
am: 37e3f22c2e
Change-Id: Ib335bc5e19c2c703d23267bf2835fc89fcf5a957
2017-02-17 00:00:14 +00:00
Hugo Benichi
37e3f22c2e
Merge "IP connectivity metrics: delete obsolete logger service"
2017-02-16 23:52:13 +00:00
Hugo Benichi
d22edc28f5
IP connectivity metrics: delete obsolete logger service
...
Test: - runtest frameworks-net
- manually verified $ adb shell dumpsys connmetrics
Bug: 32648597
Change-Id: I69f7dee5871508398d7f7209658a00c768e2d18e
2017-02-15 17:12:58 +09:00
Erik Kline
ea50c00f28
Merge "Verify duplicate upstream notifications are ignored" am: 3d57eb0bdc am: 02e71f6245 am: 8055dafb08
...
am: d850804723
Change-Id: I56a8b708178419d467abac0166f1be6c86b42491
2017-02-14 18:19:01 +00:00
Erik Kline
6bf2e10802
Merge "Cleanup in the face of upstream error" am: ed6d75d5f3 am: 76e6f790db am: 663ec79cb2
...
am: ea7e8f7352
Change-Id: I5ca36fc3b7153b029174a49593ee769e06758729
2017-02-14 18:17:43 +00:00
Erik Kline
d850804723
Merge "Verify duplicate upstream notifications are ignored" am: 3d57eb0bdc am: 02e71f6245
...
am: 8055dafb08
Change-Id: I1e10adfba2ebb9f52e86d8b35f3d0b87134c0e91
2017-02-14 09:49:56 +00:00
Erik Kline
8055dafb08
Merge "Verify duplicate upstream notifications are ignored" am: 3d57eb0bdc
...
am: 02e71f6245
Change-Id: I0e62e4f6f371aa43eae1a0e5c62787c4e84ddd9a
2017-02-14 09:45:56 +00:00
Erik Kline
02e71f6245
Merge "Verify duplicate upstream notifications are ignored"
...
am: 3d57eb0bdc
Change-Id: Iff84a1a12714047b20408f03e3bb2252a463b74b
2017-02-14 09:41:53 +00:00
Erik Kline
624bf3d7f6
Verify duplicate upstream notifications are ignored
...
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest .../tethering/TetherInterfaceStateMachineTest.java passes
Bug: 32163131
Change-Id: I3c097d766fe4c416a8e3f02640809fe1199c6ef2
2017-02-14 15:55:57 +09:00
Erik Kline
ea7e8f7352
Merge "Cleanup in the face of upstream error" am: ed6d75d5f3 am: 76e6f790db
...
am: 663ec79cb2
Change-Id: Ib726fe85b816eccbc0beab555873b77f3454bc64
2017-02-14 06:25:47 +00:00
Erik Kline
663ec79cb2
Merge "Cleanup in the face of upstream error" am: ed6d75d5f3
...
am: 76e6f790db
Change-Id: I097318f3edc5257288d582a0f17744e1f984856c
2017-02-14 06:21:44 +00:00
Erik Kline
76e6f790db
Merge "Cleanup in the face of upstream error"
...
am: ed6d75d5f3
Change-Id: If8dbf882bd8c4a8d53ae026d8f83a00a52590830
2017-02-14 06:17:38 +00:00
Gopinath Elanchezhian
027d72ebe6
Merge "Add Simulate maitanance mode in app startup test cases."
2017-02-14 06:17:36 +00:00
Erik Kline
8ea45483fc
Cleanup in the face of upstream error
...
If either enableNat() or startInterfaceForwarding() fail, be sure
to cleanup any commands that might have succeeded.
Most of this change is a refactoring of cleanupUpstreamIface() into
two methods, one of which (cleanupUpstreamInterface()) is reused
in error handling scenarios.
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest -x .../tethering/TetherInterfaceStateMachineTest.java passes
Bug: 32031803
Bug: 32163131
Change-Id: Ia4d56e03beeab1908d8b8c2202e94992f1aa58a4
2017-02-14 12:20:39 +09:00
gopinath
d3c50019b1
Add Simulate maitanance mode in app startup test cases.
...
Note : Dismissing initial dialogs on the apps (maps, youtube
and camera) craetes the profile.
Bug : b/28941042
Change-Id: Ifbc2853059ca59026d0a833e6dc7e7f96bda9117
2017-02-13 15:19:48 -08:00
Erik Kline
349a8aeff9
Merge "Add test coverage for cleanup bug to be fixed." am: 89e6bf0532 am: 0cca15ff88 am: 3de5971b40
...
am: 60d14c429b
Change-Id: Ia4a084be38e6f4dce14da012afb6760a3cbd32d0
2017-02-13 12:14:13 +00:00
Erik Kline
60d14c429b
Merge "Add test coverage for cleanup bug to be fixed." am: 89e6bf0532 am: 0cca15ff88
...
am: 3de5971b40
Change-Id: I470c481a0eebc9cadf134c73ece08803927f4ca2
2017-02-13 12:08:11 +00:00
Erik Kline
3de5971b40
Merge "Add test coverage for cleanup bug to be fixed." am: 89e6bf0532
...
am: 0cca15ff88
Change-Id: Ib5d1a6d6616b99a9e4f7cf0286ebc0a11d62bff8
2017-02-13 12:02:48 +00:00
Erik Kline
0cca15ff88
Merge "Add test coverage for cleanup bug to be fixed."
...
am: 89e6bf0532
Change-Id: I33347c8fc2bec5660b8e9c14a316f6d14a6cf8b1
2017-02-13 11:57:37 +00:00
Erik Kline
a954be9563
Add test coverage for cleanup bug to be fixed.
...
The test calls that need to pass but do not currently are commented out.
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest -x .../tethering/TetherInterfaceStateMachineTest.java passes
Bug: 32031803
Bug: 32163131
Change-Id: I68ed476920bef882f353d8e8a54c72120bc27002
2017-02-13 17:38:34 +09:00
Dianne Hackborn
59da805846
Add new VoiceInteractionSession.setUiEnabled method
...
This allows the session to turn off all of its UI. Use it
in onCreate() to prevent the session from ever creating any
of its UI. Switched the window creation and initialization to
happen lazily to support this.
Test: New test added to android.assist.cts.LifecycleTest
Bug: 30999386
Change-Id: I8eacb3697c8ac9908c50b9577abea2d20597b016
2017-02-08 14:00:31 -08:00
Ben Weiss
995f4b5721
Merge "Extract and unhide TransitionListenerAdapter"
2017-02-06 10:16:50 +00:00
Erik Kline
e8bc75bfcc
Merge "Add ConnectivityManager.networkCapabilitiesForType()" am: c313123afe am: 6f32aa0259 am: 7196e935a8
...
am: c700509ade
Change-Id: I15fe6fe4c9aec3d244b46516c2992ded33337a9f
2017-02-02 20:03:51 +00:00
Erik Kline
ee929e69fb
Merge "Add test for repeated calls to registerMobileUpstreamRequest()" am: 603eefd5d5 am: 180a3d07a8 am: d85f448274
...
am: 2ebea21074
Change-Id: I2e0ab82edd8997188c8c16dce6373ccb19657e3d
2017-02-02 16:52:43 +00:00
Erik Kline
c700509ade
Merge "Add ConnectivityManager.networkCapabilitiesForType()" am: c313123afe am: 6f32aa0259
...
am: 7196e935a8
Change-Id: I2ab05143299f13012dc2a88efca52160e08c6d97
2017-02-02 07:32:09 +00:00
Erik Kline
7196e935a8
Merge "Add ConnectivityManager.networkCapabilitiesForType()" am: c313123afe
...
am: 6f32aa0259
Change-Id: I6828bc3bb094ca8597ca2d8538045758638c374f
2017-02-02 07:27:13 +00:00
Erik Kline
6f32aa0259
Merge "Add ConnectivityManager.networkCapabilitiesForType()"
...
am: c313123afe
Change-Id: I0ad50fbf38f11b383fd889dc598cfddd47051477
2017-02-02 07:22:05 +00:00
Treehugger Robot
c313123afe
Merge "Add ConnectivityManager.networkCapabilitiesForType()"
2017-02-02 07:15:05 +00:00
Erik Kline
2ebea21074
Merge "Add test for repeated calls to registerMobileUpstreamRequest()" am: 603eefd5d5 am: 180a3d07a8
...
am: d85f448274
Change-Id: Ia629aa5dbdf10566c28525d9a05b096482db3f2d
2017-02-02 05:25:05 +00:00
Erik Kline
d85f448274
Merge "Add test for repeated calls to registerMobileUpstreamRequest()" am: 603eefd5d5
...
am: 180a3d07a8
Change-Id: I9f80a3ff713b4b00136808051a717509f600bb9a
2017-02-02 05:20:05 +00:00
Erik Kline
180a3d07a8
Merge "Add test for repeated calls to registerMobileUpstreamRequest()"
...
am: 603eefd5d5
Change-Id: I6b2a0d6df70df028ef9b8ff5d689c5a627d8daf8
2017-02-02 05:15:23 +00:00
Erik Kline
35bf06c968
Add ConnectivityManager.networkCapabilitiesForType()
...
This static method returns a NetworkCapabilities instance with
transports and capabilities set according to the given legacy type.
Also:
- add NetworkRequest.Builder.setCapabilities(), to be able to use
the NetworkCapabilities instances returned from the above
- update UpstreamNetworkMonitor to make immediate use of this
Test: as follows
- build (bullhead)
- flashed
- booted
- runtest frameworks-net passes
- WiFi to DUN upstream tethering works
Bug: 32163131
Change-Id: Idfe1ddd2815c355cbf27cf29eb0e3de177de84e9
2017-02-02 11:07:59 +09:00
Erik Kline
7462f467c1
Add test for repeated calls to registerMobileUpstreamRequest()
...
Test: as follows
- built
- flashed
- booted
- runtest framework-net passes
Bug: 32163131
Change-Id: I6d2519601b7a9dcfda2917118214a7ceb9dbbb7f
2017-02-01 21:30:15 +09:00
Lorenzo Colitti
2de4925f5c
Add an API hint for metered multipath traffic.
...
This allows an application that knows how to provide seamless
network connectivity (e.g., using QUIC multipath) to find out if
doing so is desired.
Test: builds, boots, runtest frameworks-net passes.
Bug: 34630278
Change-Id: Ic7fd0b9e1cd879fdfaf84009d7125391895e9087
2017-02-01 17:02:29 +09:00
Lorenzo Colitti
70fbc78896
ConnectivityServiceTest: remove remaining poll loops. am: d2706127d0 am: 54e9050710 am: 67d6d41954
...
am: 6e7f7dc643
Change-Id: Idc5d60f9ed5fbbb39256b9983a5b292a0302b2f1
2017-02-01 03:18:46 +00:00
Lorenzo Colitti
e45952c825
Rename AvoidBadWifiTracker to MultinetworkPolicyTracker am: 58ebe1c6f1 am: 0bc8070fce am: 338241de94
...
am: d526434f05
Change-Id: I5aefc453c022286e6ee2332a53e6c9f36472e9a5
2017-02-01 03:17:19 +00:00
Lorenzo Colitti
7d8b56b801
Attempt to make waitForIdleHandler reliable. am: ae3ce81cc3 am: 8780a8afeb am: 943808385a
...
am: 8e3718459b
Change-Id: Ia2d7a4405ce60ca99b1ee6c80c0babf93983cf64
2017-02-01 03:16:18 +00:00
Lorenzo Colitti
6e7f7dc643
ConnectivityServiceTest: remove remaining poll loops. am: d2706127d0 am: 54e9050710
...
am: 67d6d41954
Change-Id: I31681e1248721704a9b792962a2ef5955e375e93
2017-02-01 03:01:52 +00:00
Lorenzo Colitti
4fc1296cef
Remove assertEventuallyTrue as it's unnecessary. am: 30145d755c am: 90a70cac26
...
am: 90babed246
Change-Id: Ib16f54aeaa783a6e26a9d80e61388cbd9ecd9bd3
2017-02-01 03:00:41 +00:00
Lorenzo Colitti
d526434f05
Rename AvoidBadWifiTracker to MultinetworkPolicyTracker am: 58ebe1c6f1 am: 0bc8070fce
...
am: 338241de94
Change-Id: I91f1338f3488cfc60eef0c2147aa7b1d61107cdd
2017-02-01 02:59:42 +00:00
Lorenzo Colitti
8e3718459b
Attempt to make waitForIdleHandler reliable. am: ae3ce81cc3 am: 8780a8afeb
...
am: 943808385a
Change-Id: I2369fbd693b467283232f47703fd471c8ff60c1f
2017-02-01 02:58:24 +00:00
Lorenzo Colitti
67d6d41954
ConnectivityServiceTest: remove remaining poll loops. am: d2706127d0
...
am: 54e9050710
Change-Id: I06815166fe9ab4b7d6ab580a9eda5304067f9f91
2017-02-01 02:49:23 +00:00
Lorenzo Colitti
90babed246
Remove assertEventuallyTrue as it's unnecessary. am: 30145d755c
...
am: 90a70cac26
Change-Id: I7f6d543a3d05b0b165adc7a7c3938c7081c3f778
2017-02-01 02:48:10 +00:00
Lorenzo Colitti
338241de94
Rename AvoidBadWifiTracker to MultinetworkPolicyTracker am: 58ebe1c6f1
...
am: 0bc8070fce
Change-Id: I0ff0169ebc5e53cc9f57f224225fb0c93dc241ed
2017-02-01 02:47:16 +00:00
Lorenzo Colitti
943808385a
Attempt to make waitForIdleHandler reliable. am: ae3ce81cc3
...
am: 8780a8afeb
Change-Id: I72c03d3686858631aefdf96e13e8033f27788f8c
2017-02-01 02:45:55 +00:00
Lorenzo Colitti
54e9050710
ConnectivityServiceTest: remove remaining poll loops.
...
am: d2706127d0
Change-Id: I675096683c8ed4bc0e540491c0ff6aa828114313
2017-02-01 02:39:30 +00:00
Lorenzo Colitti
90a70cac26
Remove assertEventuallyTrue as it's unnecessary.
...
am: 30145d755c
Change-Id: Id574b27b40e35fbccac49910867e9735c03118d4
2017-02-01 02:38:30 +00:00