Commit Graph

284858 Commits

Author SHA1 Message Date
Joel Scherpelz
bf152b14c4 Merge "Support requesting and receiving wakeup events" 2017-05-29 03:28:02 +00:00
Joel Scherpelz
b369bf5d3a Support requesting and receiving wakeup events
Test: as follows
    - built
    - flashed
    - booted
    - ConnectivityServiceTest passes
Bug: 28806131

Change-Id: Ifc45260d5315479393da2c859ba4afed4e0e8c85
2017-05-29 11:19:16 +09:00
Erik Kline
39ce589f0b Merge "Minor improvement in logging in TetheringConfiguration" 2017-05-28 11:06:40 +00:00
Erik Kline
6bd7453206 Minor improvement in logging in TetheringConfiguration
Test: as follows
    - built
    - booted
    - flashed
    - runtest frameworks-net passes
    - dumpsys connectivity shows expected output
Bug: 32163131
Bug: 36504926
Bug: 36988090
Bug: 38152109
Bug: 38186915
Bug: 38218697
Change-Id: I4a2129d780dfec7bca693486a100ea3c78465430
2017-05-28 18:05:23 +09:00
Hall Liu
8e7057ccf3 Merge "Add new error codes in MbmsException" 2017-05-27 01:08:31 +00:00
Treehugger Robot
725e212de3 Merge "Add 32 and 128 bit Service Data parsing." 2017-05-26 22:53:29 +00:00
Hall Liu
80a8687a87 Add new error codes in MbmsException
Test: builds
Change-Id: I523961f588ef5ada97e06f5a910875c123f97989
2017-05-26 15:49:32 -07:00
Treehugger Robot
99c805b319 Merge "Make NFC AIDL callbacks oneway" 2017-05-26 22:20:58 +00:00
Treehugger Robot
b1f0bb6f83 Merge "Add ID_LENGTH field for Empty type record" 2017-05-26 22:07:39 +00:00
Jakub Pawlowski
45033a7e57 Add 32 and 128 bit Service Data parsing.
Bug: 62078132
Change-Id: I79ff75cd5ccbe346dca79693b074ff3cd09112dd
2017-05-26 21:11:24 +00:00
Ruchi Kandoi
5dc487d588 Make NFC AIDL callbacks oneway
Test: Read NFC tags, Android Beam
Bug: 32288773
Change-Id: I6294ec29be2af8feb578e9bfd5e0770ad9c09cc0
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-05-26 21:06:25 +00:00
Yuka Anami
dd0c9bbbb2 Add ID_LENGTH field for Empty type record
If ID_LENGTH field is omitted from Empty Type record, it cannot be
detected as Ndef since the data is strictly checked by e3fc7d9954.
But it is not possible to create raw bytes of Empty Type record
which can meet this condition by using NdefRecord/NdefMessage.
To fix this issue, added ID_LENGTH field to Empty type record.

Bug: 38299566
Test: Write and read NDEF tag with empty type record
Change-Id: Idb58c80cf8562a8b314f4ddeccdc627dc0c6f5b4
2017-05-26 20:53:10 +00:00
Treehugger Robot
21cc4bcd01 Merge "WifiManager: add iface name and mode labels" 2017-05-26 16:26:38 +00:00
Rebecca Silberstein
dc5abdd80d WifiManager: add iface name and mode labels
Connectivity service needs to get the interface name and intended ip
configuration mode for softap.
This CL adds the interface name and softap target mode variables to
use to insert the extra info into the wifi ap state change broadcast.

Note: additional CLs are needed to verify the iface name and mode.  The
mode tracking is still in progress.

Bug: 62076211
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Test: manually verified the name in the broadcast
Merged-In: I67f82525b5c0fa5b81235311988c9b186d16077a
Merged-In: Ieff7af7c1ac2113b8044c16a01cad0f96cb70158
Change-Id: I64e1d13a9e422945fe9c4c268c206da365d0a3eb
(cherry picked from commit 4ac2cab8fd)
2017-05-26 19:16:43 +09:00
Treehugger Robot
7ee96625c2 Merge "Support registration of offload control callbacks." 2017-05-26 10:07:27 +00:00
Nicolas Geoffray
18c3201986 Merge "Pass bootComplete to dexopt." 2017-05-26 08:00:45 +00:00
Erik Kline
f4b6e34fc0 Support registration of offload control callbacks.
Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 29337859
Bug: 32163131
Bug: 34361337
Change-Id: I054cdf6a277c77e4cbf5c81145446a9be1c5fe39
2017-05-26 16:47:04 +09:00
Hugo Benichi
0388f0e47b Merge changes If4deb106,Ib25d7658
* changes:
  NsdService: do not use ContentResolver directly
  @Ignore ConnectivityServiceTest#testRequestBenchmark
2017-05-26 00:34:05 +00:00
Brad Ebinger
25ce41cf4c Merge "Add IMEI_NOT_ACCEPTED error code for IMS" 2017-05-25 22:31:53 +00:00
Hugo Benichi
03f6e1d18a NsdService: do not use ContentResolver directly
This patch changes NsdService to call registerContentObserver in the
ContentResolver class indirectly through NsdSettings.

This allows to easily intercept it and mock it in unit tests, and solves
test failures on the internal master branch where
registerContentObserver uses final or static methods that cannot be
worked around.

Bug: 32561414
Bug: 62044295
Test: runtest -x frameworks/base/tests/net/../NsdServiceTest.java
Change-Id: If4deb106de551746babb70196b20f21ece478850
2017-05-26 07:18:15 +09:00
Hugo Benichi
849b81b7ab @Ignore ConnectivityServiceTest#testRequestBenchmark
Ignore the last remaining test in ConnectivityServiceTest with spurious
failures. testRequestBenchmark has some intrinsic chances of failure due
to the fact it attempts to assert elapsed time durations against a
reference target.

Bug: 32561414
Test: no functional change
Change-Id: Ib25d76581b47997b2ef84df3e6a9fd9224b85d92
2017-05-26 07:18:15 +09:00
Treehugger Robot
475d9b283c Merge "HIDL: C++ Java parity" 2017-05-25 16:28:43 +00:00
Nicolas Geoffray
3b4359a06c Pass bootComplete to dexopt.
bug: 37165062
Test: After OTA, check bootComplete=false on package updates
Change-Id: I6fc00216020bb16d8ed4f6e839b5e1df0e942700
2017-05-25 13:56:00 +01:00
Neil Fuller
3436fd4833 Merge "Remove time_zones_by_country.xml file" 2017-05-25 10:39:15 +00:00
Hugo Benichi
48859e01d5 Merge "NsdServiceInfo: move test to tests/net" 2017-05-25 00:50:27 +00:00
Joel Scherpelz
81fda77884 Merge "Ignore flow label when comparing RAs in APF" 2017-05-24 23:54:24 +00:00
Tyler Gunn
255a171c5d Merge "Add ability to dump events in a timeline view." 2017-05-24 22:36:44 +00:00
Brad Ebinger
671680e504 Merge "Support RRO for emergency number conversion map" 2017-05-24 20:19:32 +00:00
Neil Fuller
1e49f6c35f Remove time_zones_by_country.xml file
time_zones_by_country.xml has been replaced by a file that can
be updated outside of an OTA and can be accessed via
libcore.util.TimeZoneFinder. This means parsing code has been
removed from this class and replaced by calls to libcore code.

libcore code uses ICU so this class adapts to
java.util.TimeZone for published public APIs as well as other
knock-ons to reduce impact of this change in telephony code.
All use of classes called TimeZone are fully-qualified to
reduce confusion.

Several public-but-hidden methods have been removed. These
can be returned if there are any important apps relying on
them.

Bug: 25338903
Test: Ran CtsUtilTestCases
Change-Id: I699b4e7420e8d7e61ee68ec96552ab3144c9bab2
2017-05-24 15:31:16 +01:00
Treehugger Robot
8516a2025a Merge "[NotificationManagerService]Support multi users to notification pulse" 2017-05-24 14:28:50 +00:00
Paul Duffin
d3ff45985a Merge "Fixed nfc-extras build files" 2017-05-24 08:01:38 +00:00
Hugo Benichi
e7514335bf NsdServiceInfo: move test to tests/net
This patch also
  - adds a license plate to NsdServiceInfoTest
  - fixes some formatting and style issues
      package name
      uses of canonical junit asserts
  - update NsdServiceInfoTest to not use the deprecated AndroidTestCase

Bug: 62044295
Bug: 32561414
Test: $ runtest frameworks-net passes
Change-Id: Ie5ebb00172aef4eec19e6ecd2b41c4467901b93d
2017-05-24 16:03:43 +09:00
Treehugger Robot
0a76f99621 Merge "Move NsdServiceTest to correct directory" 2017-05-24 06:47:30 +00:00
Joel Scherpelz
967dec794b Ignore flow label when comparing RAs in APF
This change modifies the RA filter generation code to ignore bytes 1-3
of the IPv6 header. It also updates testApfFilterRa such that it fails
without the updates to ApfFilter.

Test: as follows
        - built
        - flashed
        - booted
        - sent RAs from OS X with differing flow labels and observed
	      that they were filtered
	- ApfTest passes
Bug: 31166495

(cherry picked from commit 7006bd4fe5eba4b6fad43dd28d9cad2d26ce140a)

Change-Id: I32153238193ac13a0e59be1875d983a0567c41c7
2017-05-24 15:24:24 +09:00
Hugo Benichi
523d466b91 Move NsdServiceTest to correct directory
Test: no functional change
Bug: 62044295
Change-Id: Iad3af646e8d252f84978d1a367878a78c2869982
2017-05-24 14:18:48 +09:00
Treehugger Robot
485d103083 Merge "Fix up upstream interface types for case DUN_UNSPECIFIED" 2017-05-24 01:51:04 +00:00
Steven Moreland
afe95a9978 HIDL: C++ Java parity
Add same restrictions to Java that we have in C++ HIDL
code for C++ services.

Test: hidl_test_java, multiple internal devices work
Bug: 38415912
Change-Id: I48571a5cd94b0ba6b1f722d032e45aac6e9527ed
2017-05-23 16:32:00 -07:00
Jayachandran C
5805982027 Fix up upstream interface types for case DUN_UNSPECIFIED
The existing logic will add TYPE_MOBILE and TYPE_MOBILE_HIPRI
even if the carrier config has TYPE_DUN for DUN_UNSPECIFIED.

A check is added not to modify the upstream interface types
if there is already a cellular interface type. Add TYPE_MOBILE
and TYPE_MOBILE_HIPRI if there is no cellular types found.

Test: Hotspot on Verizon and T-Mobile US.
      Verified the requestNetwork has the DUN capability.

Bug: 38186915
Change-Id: I74fc5c791fee2885bf66df8975e92c2b48f1668c
2017-05-23 14:02:46 -07:00
Treehugger Robot
65d3a457d2 Merge "Consider the last inserted SIM for EmergencyAffordance" 2017-05-23 20:34:56 +00:00
Dan Willemsen
f523227a6e Merge "Fix makefile warning." 2017-05-23 16:58:49 +00:00
Hugo Benichi
0dc35fa969 Merge "Fix NetworkStatsObserversTest" 2017-05-23 11:29:48 +00:00
Paul Duffin
1f0b6c816f Fixed nfc-extras build files
The com.android.nfc_extras target was including the test class.
The nfc-extras/tests/Android.mk file was not being included so
was not being built by continuous build and could not be built
using make NfcExtrasTests.

Bug: 38487370
Bug: 30188076
Test: make checkbuild
Change-Id: I17f6723b899f26de329a2e74177bd02ba864b7b2
2017-05-23 11:51:15 +01:00
Treehugger Robot
44b7e94a7c Merge "NetworkManagementService.java: fix error-prone warnings" 2017-05-23 10:31:59 +00:00
Hugo Benichi
ec1f25a4ba Merge "Fix NetworkStatsAccessTest" 2017-05-23 06:43:07 +00:00
Treehugger Robot
857e7d9c85 Merge "ConnectivityManager: simplify callback handler" 2017-05-23 06:16:49 +00:00
Tomasz Wasilczyk
191330e4a1 Fix makefile warning.
Test: it builds.
Bug: b/37159108
Change-Id: I73c09c8eeb0bab5f506c3d81072cc80c71f63779
Merged-In: I73c09c8eeb0bab5f506c3d81072cc80c71f63779
2017-05-22 22:39:15 -07:00
Treehugger Robot
5041bbde19 Merge "Refactor TISM add/remove code" 2017-05-23 04:44:23 +00:00
Hugo Benichi
a82cac1452 Merge "ConnectivityServiceTest: fix flakyness" 2017-05-23 04:35:11 +00:00
Treehugger Robot
cdfd3a186f Merge "ConnectivityManager: improve argument validation" 2017-05-23 03:14:29 +00:00
Hugo Benichi
2c68452320 ConnectivityManager: simplify callback handler
Bug: 36701874
Test: $ runtest frameworks-net
Change-Id: I4d5f08903a54f8dced7cb6ae86703847b908b784
2017-05-23 10:39:46 +09:00