Commit Graph

285808 Commits

Author SHA1 Message Date
Calin Juravle
d7a40aced2 Merge "Also pin vdex file for camera" am: d4ae914be2
am: a433a9d9f4

Change-Id: I943815b1e8b29734224d49140a667bf4d7d23b8f
2017-05-18 21:21:11 +00:00
Calin Juravle
a433a9d9f4 Merge "Also pin vdex file for camera"
am: d4ae914be2

Change-Id: I0d1a687ea2d90e968fe4e9705de223dc8b181238
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

Change-Id: I31606372f361ad0cb8d9600f79c41257e121c7f4
2017-05-18 09:15:30 +00:00
Przemyslaw Szczepaniak
ab0f6fc5d2 Merge "Consolidated all data allow/disallow logic into one method"
am: 449d73251f

Change-Id: I861d75dad60ab83039aa06565141a2eb5b294386
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

Change-Id: I58f88c3f5505b83539654c75e05de4eb29b64f15
2017-05-18 03:47:16 +00:00
Erik Kline
96f9371a66 Merge "Expand logging capabilities of Tethering subsystem"
am: 0373340b07

Change-Id: I1381b8457781dcfafe52371a5dc7628282cb8efc
2017-05-18 03:38:43 +00:00
Hugo Benichi
31c566037b Merge "Fix NetworkNotificationManagerTest" am: c13a80deee
am: 13f0d10115

Change-Id: Icf4e4e9c9dde7f6c8308adb79e3ca8b63d6f604b
2017-05-18 03:36:50 +00:00
Hugo Benichi
13f0d10115 Merge "Fix NetworkNotificationManagerTest"
am: c13a80deee

Change-Id: I8f02be13da5790d0fd60f04886e87de04c96de08
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

Change-Id: Ib154e58cab427aa60740246f3eef930a09261733
2017-05-18 03:08:46 +00:00
Hugo Benichi
3bda223110 Merge "Captive portals: reinspect http result after fallback probe"
am: 3a7c4f3337

Change-Id: Ia9dfbb764909aeb8586066121ddc8106fa14bb7e
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

Change-Id: I06cec2595d67d029e08e4d556130c5956bfb387e
2017-05-18 02:30:44 +00:00
Hugo Benichi
9fdc903af7 Merge "Move NetworkNotificationManagerTest to tests/net"
am: c01fbf0f0c

Change-Id: I10ce85211ac0305e8d05ca02b58b819297f59bbf
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

Change-Id: Ic9f06631a7f937a0f3730b167e5db7d8c0dcf775
2017-05-18 00:37:40 +00:00
Hugo Benichi
cd821b231a Merge "Finish moving NetworkStats tests to tests/net"
am: 1ae1b6b960

Change-Id: If85e483d5b44872c10e42ef55ddaf209601c7cfa
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

Change-Id: I792b4f48d57181b4ee55b2a73c597272826844e2
2017-05-17 21:55:19 +00:00
Colin Cross
e9ffa404ae Merge "Convert libsoundpool to Android.bp"
am: dde9ee9edd

Change-Id: Ia7bb54b658031c68036ee2a218e5b229d32b1d25
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

Change-Id: I008ff84f3d3eb0b7c51993d213a9d3a590cd93a6
2017-05-17 17:41:05 +00:00
Ram Periathiruvadi
543261753a Merge "Fix for Bluetooth not restarting on User Switch"
am: 196b72aae5

Change-Id: Id0ef82b93b047f13683f7538740f0544549b0eca
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
Colin Cross
7eb3f1c1c4 Merge "Convert libmedia_jni to Android.bp" am: 85faffa7ef
am: 162d19f590

Change-Id: Iac2f159014051604d36f61dd253fa4e83127030a
2017-05-17 15:36:06 +00:00
Colin Cross
162d19f590 Merge "Convert libmedia_jni to Android.bp"
am: 85faffa7ef

Change-Id: I7afbf6dda3dab6a3c36576e2c118b1accdcc2a17
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
Hugo Benichi
e7e10303f3 Finish moving NetworkStats tests to tests/net
Follow-up of commit c86013be93.

Also add @SmallTest annotation to classes moved to tests/net.

Test: no functional change
Bug: 32561414
Change-Id: I0a0e8865d37ba7bae06ce352d3fc385989adc300
2017-05-17 22:24:05 +09:00
Hugo Benichi
fc47442b31 Captive portals: reinspect http result after fallback probe
When DNS queries that precede the http and https probe take a long time
to complete, it is possible that the fallback probe fires earlier than
either the http and https probes.

This causes the detection logic to ignore the result of the http probe,
which may cause the system to miss captive portals advertising
themselves on the url used by the http probe but not on the url used by
the fallback probe.

This patch fixes that issue by forcing the detection to wait on the
result of the http probe if the fallback probe does not find a portal.

Bug: 38259299
Bug: 36532213
Test: manually tested with nearby captive portal networks
Change-Id: I07ea23a2b5f694c5ada9633169af98409efedff1
2017-05-17 22:11:16 +09:00
Erik Kline
c967d56ad7 Merge "Add tethering offload HAL call via JNI" am: 8f65e470b0
am: f421d60824

Change-Id: I49a81e240cfd5d6ad58bb3af50fbcb9a410eb0d8
2017-05-17 07:26:25 +00:00
Erik Kline
f421d60824 Merge "Add tethering offload HAL call via JNI"
am: 8f65e470b0

Change-Id: Ib8403f685371b44f0fdad6d15ae372787d457d13
2017-05-17 07:18:51 +00:00
Treehugger Robot
8f65e470b0 Merge "Add tethering offload HAL call via JNI" 2017-05-17 07:09:15 +00:00
Colin Cross
58d87e8ab7 Convert libmedia_jni to Android.bp
See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: I1817c75ee45537ca0d5fc40a035f94a3dfeccc11
Merged-In: I1817c75ee45537ca0d5fc40a035f94a3dfeccc11
(cherry picked from commit 76de4f6b4d)
2017-05-16 22:05:39 -07:00
Erik Kline
5a7c8a0b24 Add tethering offload HAL call via JNI
Additionally, try to locate java Control interface.

Test: as follows
    - built
    - flashed
    - booted
    - OffloadController log messages observed, but only ever
      "not enabled" messages (needs a supporting implementation)
Bug: 29337859
Bug: 32163131
Bug: 34361337
Merged-In: I5251d05f2d2fd732a33a8955a6c346b3a2401e46
Change-Id: I5251d05f2d2fd732a33a8955a6c346b3a2401e46
(cherry picked from commit 58ed1b051b)
2017-05-17 13:44:25 +09:00
Ying Xu
7ae9c06663 Merge "Add the new RIL requests and NetworkScanResult." am: 0727abc423
am: a37b511b67

Change-Id: If49a2d8139863f0322d73a90bd1d70cc1965bece
2017-05-16 23:21:40 +00:00
Ying Xu
a37b511b67 Merge "Add the new RIL requests and NetworkScanResult."
am: 0727abc423

Change-Id: I41560f522b3c46de4fe1a7a8377a6f2b7af04534
2017-05-16 23:11:24 +00:00
Ying Xu
0727abc423 Merge "Add the new RIL requests and NetworkScanResult." 2017-05-16 23:04:42 +00:00
Andreas Gampe
85c5e1c123 Merge "Zygote: Allow arbitrary-length wrap property names" am: 11780f1ad3
am: c942ae61e9

Change-Id: I06a030f61b15aae3bb971c5f5666c940592f48e0
2017-05-16 21:09:51 +00:00
Andreas Gampe
c942ae61e9 Merge "Zygote: Allow arbitrary-length wrap property names"
am: 11780f1ad3

Change-Id: Id1454ecd597347d5fca5f06a17df26e7303c59db
2017-05-16 21:03:04 +00:00
Treehugger Robot
11780f1ad3 Merge "Zygote: Allow arbitrary-length wrap property names" 2017-05-16 20:49:56 +00:00
Jakub Pawlowski
23105d57d5 Merge "Discover primary service by UUID for PTS tests (4/4)" am: abb732fc40
am: 7e80b882b7

Change-Id: I048c7b1ca915744da1e06e0280be125e7da2b796
2017-05-16 20:40:58 +00:00
yinxu
84c9e01f10 Add the new RIL requests and NetworkScanResult.
Those new RIL requests will be used to start and stop network scan, and
the scan result will be returned from RIL in the format of
NetworkScanResult.

Test: Telephony sanity tests
Bug: 30954762
Change-Id: I2bfd0fb8cbb3815cc62ec4385594dec9c5e4d279
(cherry picked from commit b36a4cb402)
2017-05-16 13:34:59 -07:00