Hugo Benichi
08ab9ea526
Merge "Address ConnectivityManager API comments." am: b5d6e45e8d
...
am: b57db6ef97
2017-05-19 23:24:56 +00:00
Hugo Benichi
b57db6ef97
Merge "Address ConnectivityManager API comments."
...
am: b5d6e45e8d
2017-05-19 23:14:08 +00:00
Hugo Benichi
b5d6e45e8d
Merge "Address ConnectivityManager API comments."
2017-05-19 23:05:57 +00:00
Hall Liu
efa377cbb6
Merge "Implement stopStreaming API for MBMS" am: e245bf9067
...
am: a7fffdc0d9
2017-05-19 22:47:06 +00:00
Hall Liu
a7fffdc0d9
Merge "Implement stopStreaming API for MBMS"
...
am: e245bf9067
2017-05-19 22:40:22 +00:00
Hall Liu
e245bf9067
Merge "Implement stopStreaming API for MBMS"
2017-05-19 22:32:04 +00:00
Hugo Benichi
6246ddc338
Merge "Add a method to start the captive portal login app." am: 30f2544f0c
...
am: f238a96172
2017-05-19 02:48:01 +00:00
Hugo Benichi
f238a96172
Merge "Add a method to start the captive portal login app."
...
am: 30f2544f0c
2017-05-19 02:39:29 +00:00
Hugo Benichi
30f2544f0c
Merge "Add a method to start the captive portal login app."
2017-05-19 02:29:21 +00:00
Lorenzo Colitti
b7535c86a0
Merge "Add test coverage for explicitlySelected networks." am: 1bc1936ae9
...
am: 3d55c5539c
2017-05-19 02:25:32 +00:00
Lorenzo Colitti
3d55c5539c
Merge "Add test coverage for explicitlySelected networks."
...
am: 1bc1936ae9
2017-05-19 02:15:53 +00:00
Lorenzo Colitti
1bc1936ae9
Merge "Add test coverage for explicitlySelected networks."
2017-05-19 02:05:55 +00:00
Lorenzo Colitti
2965d33afc
Add a method to start the captive portal login app.
...
Bug: 36203355
Bug: 36656914
Test: ConnectivityServiceTest (including new test) passes
Change-Id: Ide82858af67024623560ab79beea27c201b63447
Merged-In: I82a9a9a8da47870ba3f1bbef5941b37e970c844f
(cherry picked from commit 4734cdbbc3
2017-05-19 00:58:41 +00:00
Hall Liu
edbd456c04
Implement stopStreaming API for MBMS
...
Test: testapps
Change-Id: Ic0477bf489a89a67697a318ff0fab065e0327e08
2017-05-18 17:41:05 -07:00
Calin Juravle
d7a40aced2
Merge "Also pin vdex file for camera" am: d4ae914be2
...
am: a433a9d9f4
2017-05-18 21:21:11 +00:00
Calin Juravle
a433a9d9f4
Merge "Also pin vdex file for camera"
...
am: d4ae914be2
2017-05-18 21:12:05 +00:00
Calin Juravle
d4ae914be2
Merge "Also pin vdex file for camera"
2017-05-18 21:03:50 +00:00
Przemyslaw Szczepaniak
2ce1b38e85
Merge "Consolidated all data allow/disallow logic into one method" am: 449d73251f
...
am: ab0f6fc5d2
2017-05-18 09:15:30 +00:00
Przemyslaw Szczepaniak
ab0f6fc5d2
Merge "Consolidated all data allow/disallow logic into one method"
...
am: 449d73251f
2017-05-18 09:07:24 +00:00
Przemyslaw Szczepaniak
449d73251f
Merge "Consolidated all data allow/disallow logic into one method"
2017-05-18 08:58:28 +00:00
Jack Yu
bd7d89c133
Consolidated all data allow/disallow logic into one method
...
Consolidated all data allow/disallow logic into one method
and got rid of the obsolete isDataPossible. This is the
preliminary work for checking if data is allowed just right
before data connection entering connected state.
Test: Telephony sanity tests and unit tests
bug: 33847610
Merged-In: I24f1415bbb59990e9e8e9920724be9e3f17e3e60
Change-Id: I24f1415bbb59990e9e8e9920724be9e3f17e3e60
2017-05-17 21:16:39 -07:00
Erik Kline
945ff184c2
Merge "Expand logging capabilities of Tethering subsystem" am: 0373340b07
...
am: 96f9371a66
2017-05-18 03:47:16 +00:00
Erik Kline
96f9371a66
Merge "Expand logging capabilities of Tethering subsystem"
...
am: 0373340b07
2017-05-18 03:38:43 +00:00
Hugo Benichi
31c566037b
Merge "Fix NetworkNotificationManagerTest" am: c13a80deee
...
am: 13f0d10115
2017-05-18 03:36:50 +00:00
Hugo Benichi
13f0d10115
Merge "Fix NetworkNotificationManagerTest"
...
am: c13a80deee
2017-05-18 03:29:50 +00:00
Treehugger Robot
0373340b07
Merge "Expand logging capabilities of Tethering subsystem"
2017-05-18 03:25:30 +00:00
Hugo Benichi
c13a80deee
Merge "Fix NetworkNotificationManagerTest"
2017-05-18 03:20:51 +00:00
Hugo Benichi
80eb47ff61
Merge "Captive portals: reinspect http result after fallback probe" am: 3a7c4f3337
...
am: 3bda223110
2017-05-18 03:08:46 +00:00
Hugo Benichi
3bda223110
Merge "Captive portals: reinspect http result after fallback probe"
...
am: 3a7c4f3337
2017-05-18 02:58:21 +00:00
Hugo Benichi
3a7c4f3337
Merge "Captive portals: reinspect http result after fallback probe"
2017-05-18 02:50:50 +00:00
Hugo Benichi
777bf77c2c
Merge "Move NetworkNotificationManagerTest to tests/net" am: c01fbf0f0c
...
am: 9fdc903af7
2017-05-18 02:30:44 +00:00
Hugo Benichi
9fdc903af7
Merge "Move NetworkNotificationManagerTest to tests/net"
...
am: c01fbf0f0c
2017-05-18 02:23:12 +00:00
Hugo Benichi
e6181b0c47
Fix NetworkNotificationManagerTest
...
The testNotificationsShownAndCleared test was not doing anything
because the list of notification to show was always empty.
This patch fixes this issue and actually makes the test loop on
non-empty collections, and also fixes another ordering issue in
assertions themselves, hidden until now by the first issue.
Bug: 32561414
Test: runtest -x frameworks/base/tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java
Merged-In: I4837b1175d7c9133e9156e33acaa1e7e3341cc62
Change-Id: Ia30587bd68a87b83b62f57eeeb28fef7d95dbf81
(cherry picked from commit f8b804be5a
2017-05-18 11:08:31 +09:00
Hugo Benichi
c01fbf0f0c
Merge "Move NetworkNotificationManagerTest to tests/net"
2017-05-18 02:01:40 +00:00
Erik Kline
7747fd4ce0
Expand logging capabilities of Tethering subsystem
...
Introduce a SharedLog that can be shared among all Tethering
components. All log entries go to the same log, and each includes
its subsystem name. Additionally, all entries emitted to the
system log shared the same tag, so can easily be watched.
More subsystems can inherit a SharedLog, but to minimize cherry-pick
conflicts we limit ourselves to these changes only.
Test: as follows
- built
- flashed
- booted
- log output observed via dumpsys
- runtest frameworks-net passes
Bug: 32163131
Bug: 36988090
Bug: 38218697
Change-Id: I1229d4c55987402d84b0d4a2c8a595e0c829aa3e
2017-05-18 09:46:45 +09:00
Hugo Benichi
544bcbe78e
Merge "Finish moving NetworkStats tests to tests/net" am: 1ae1b6b960
...
am: cd821b231a
2017-05-18 00:37:40 +00:00
Hugo Benichi
cd821b231a
Merge "Finish moving NetworkStats tests to tests/net"
...
am: 1ae1b6b960
2017-05-18 00:27:06 +00:00
Hugo Benichi
1ae1b6b960
Merge "Finish moving NetworkStats tests to tests/net"
2017-05-18 00:09:54 +00:00
Colin Cross
13ea256d71
Merge "Convert libsoundpool to Android.bp" am: dde9ee9edd
...
am: e9ffa404ae
2017-05-17 21:55:19 +00:00
Colin Cross
e9ffa404ae
Merge "Convert libsoundpool to Android.bp"
...
am: dde9ee9edd
2017-05-17 21:45:33 +00:00
Treehugger Robot
dde9ee9edd
Merge "Convert libsoundpool to Android.bp"
2017-05-17 21:31:20 +00:00
Colin Cross
da8082bda2
Convert libsoundpool to Android.bp
...
See build/soong/README.md for more information.
Test: m -j checkbuild
Change-Id: If0b7cb1e2c86ff1be41c00d98fd9ddec31287a53
Merged-In: If0b7cb1e2c86ff1be41c00d98fd9ddec31287a53
(cherry picked from commit 98c127f8cc
2017-05-17 13:22:34 -07:00
Ram Periathiruvadi
5100f55b8b
Merge "Fix for Bluetooth not restarting on User Switch" am: 196b72aae5
...
am: 543261753a
2017-05-17 17:41:05 +00:00
Ram Periathiruvadi
543261753a
Merge "Fix for Bluetooth not restarting on User Switch"
...
am: 196b72aae5
2017-05-17 17:33:28 +00:00
Treehugger Robot
196b72aae5
Merge "Fix for Bluetooth not restarting on User Switch"
2017-05-17 17:24:04 +00:00
Lorenzo Colitti
02cc839411
Add test coverage for explicitlySelected networks.
...
Also, make all tests start with mobile data always on disabled.
This is because some tests only pass when mobile data always on
is disabled. This doesn't cause any problems when running all
the tests in the file, because these tests are always run after
one or more calls to tearDown, which disables mobile data always
on. However, it does cause issues when those tests are run alone.
Test: new test passes 50 times in a row
Test: ConnectivityServiceTest passes
Change-Id: I1eef5d7f5ec5464e0f9a1d7f1130d9ba6dea4557
2017-05-18 00:46:14 +09:00
Colin Cross
7eb3f1c1c4
Merge "Convert libmedia_jni to Android.bp" am: 85faffa7ef
...
am: 162d19f590
2017-05-17 15:36:06 +00:00
Colin Cross
162d19f590
Merge "Convert libmedia_jni to Android.bp"
...
am: 85faffa7ef
2017-05-17 15:29:29 +00:00
Colin Cross
85faffa7ef
Merge "Convert libmedia_jni to Android.bp"
2017-05-17 15:19:27 +00:00
Hugo Benichi
d8ddab6ba5
Move NetworkNotificationManagerTest to tests/net
...
Bug: 32561414
Test: no functional change
Change-Id: Iad17e3336a4a589da5cf88fd6359323e34b747e1
2017-05-17 22:24:05 +09:00
