OSDN Git Service
Hugo Benichi [Thu, 1 Jun 2017 03:58:49 +0000 (12:58 +0900)]
Captive portal login shows specific network name
Bug:
62274222
Bug:
38197949
Bug:
36532213
Test: manually tested by triggering the captive portal login activity
Change-Id: If10448dce5db0fc3c46cedba58abda26e30e2507
Treehugger Robot [Mon, 5 Jun 2017 04:19:28 +0000 (04:19 +0000)]
Merge "Minor upstream selection refactoring"
Treehugger Robot [Mon, 5 Jun 2017 03:47:58 +0000 (03:47 +0000)]
Merge "Fix captive portal login ssl error overflow"
Erik Kline [Sun, 4 Jun 2017 02:36:01 +0000 (11:36 +0900)]
Minor upstream selection refactoring
Specifically:
- relocated "tryCell" handling
- minor logging change
- remove unneeded checkExpectedThread()
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: I2f5428206503fd222b959e695c26326df53038f1
Hugo Benichi [Fri, 2 Jun 2017 01:12:09 +0000 (10:12 +0900)]
Fix captive portal login ssl error overflow
This patch fixes the built-in html page shown in the captive portal
login activity when there is an ssl error. The page is now scaled
correctly with respect to the device screen, and text wraps as
expected.
This patch also cleanups the hardcoded page by:
- formatting it for better reading,
- inlining the "px" css rules,
- using string concatenation instead of format for including the
localized text.
Bug:
62269512
Bug:
36532213
Test: manually triggered the activity to load the error page
Change-Id: I9d037222798bd9d4c1736923afb71e3e14c68bcc
nharold [Fri, 2 Jun 2017 23:40:16 +0000 (23:40 +0000)]
Merge "Add UDP Encap Socket Support to IpSecManager"
Brad Ebinger [Fri, 2 Jun 2017 22:09:47 +0000 (22:09 +0000)]
Merge "Adds ACCESS_CLASS_BLOCKED Disconnect cause"
Brad Ebinger [Fri, 2 Jun 2017 17:56:40 +0000 (10:56 -0700)]
Adds ACCESS_CLASS_BLOCKED Disconnect cause
Adds the ACCESS_CLASS_BLOCKED Disconnect cause in order
to allow the dialer to take action when this happens
during a VT call.
Bug:
33821263
Test: Build
Change-Id: I9afdd90f0a8a562b626b730dbb1b03cf37776ebd
Treehugger Robot [Fri, 2 Jun 2017 17:20:30 +0000 (17:20 +0000)]
Merge "Testra RSSI compliance"
Treehugger Robot [Fri, 2 Jun 2017 17:16:41 +0000 (17:16 +0000)]
Merge "Testra RSSI compliance"
Sooraj Sasindran [Tue, 9 May 2017 22:00:55 +0000 (15:00 -0700)]
Testra RSSI compliance
Devices that support 4 bar signal strength
indication should display the bars as follow:
4 bar RSRP > -90
3 bar -90 ≥ RSRP > -100
2 bar -100 ≥ RSRP > -115
1 bar -115 ≥ RSRP > -120
0 bar RSRP ≤ -120
or No Sync to LTE Reference Signals
Bug=
37187586
Change-Id: I2a76aabdf6d8ef1be3a05a90643b1e670f929bc3
Sooraj Sasindran [Fri, 12 May 2017 00:36:37 +0000 (17:36 -0700)]
Testra RSSI compliance
Devices that support 4 bar signal strength
indication should display the bars as follow:
4 bar RSRP > -90
3 bar -90 ≥ RSRP > -100
2 bar -100 ≥ RSRP > -115
1 bar -115 ≥ RSRP > -120
0 bar RSRP ≤ -120
or No Sync to LTE Reference Signals
Add support for mnc 11, 71 and 72
BUG=
37187586
Change-Id: Ia0a71707d1cbc20887bcc00c0519833b522b4a95
Treehugger Robot [Fri, 2 Jun 2017 05:19:31 +0000 (05:19 +0000)]
Merge "Handle Wi-Fi passing explicit interface name and AP/IP mode"
Erik Kline [Wed, 31 May 2017 06:53:53 +0000 (15:53 +0900)]
Handle Wi-Fi passing explicit interface name and AP/IP mode
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
31466854
Bug:
32163131
Bug:
62076211
Change-Id: I3557a9c14f4e9f1de1869084566a179003d98ffe
Nathan Harold [Wed, 5 Apr 2017 02:37:48 +0000 (19:37 -0700)]
Add UDP Encap Socket Support to IpSecManager
-Implement the UdpEncapsulationSocket
-Convert all ManagedResources to use resourceIds
-Rework ManagedResource to track resourceIds
Bug:
30984788
Test: cts - IpSecManagerTest#testUdpEncapsulation()
Change-Id: I7b1099c487051a8d951c1485791c4b6cef2deb1d
Treehugger Robot [Fri, 2 Jun 2017 01:26:14 +0000 (01:26 +0000)]
Merge "WifiManager: add unspecified ip mode"
Treehugger Robot [Thu, 1 Jun 2017 23:13:24 +0000 (23:13 +0000)]
Merge "Optimised hwui rounded corners shader"
Arun [Mon, 23 Jan 2017 11:59:21 +0000 (11:59 +0000)]
Optimised hwui rounded corners shader
This is a ~2x performance increase for the rounded corners shader which
was previously shader limited even on many high-end GPUs. It simplifies
the calculations by pre-dividing by the radius, which also allows to
maintain mediump/FP16 precision (this improves performance and might
improve image quality on GPUs that don't support highp e.g. Mali-400).
It also uses a conditional in the shader to save much of the work on
the vast majority of pixels which are not close to the corners.
Test: manual - visual inspection on fugu (nexus player)
Change-Id: I38f491cfb006e2991ef0b9d6b3d67d2c4d328d44
Robert Greenwalt [Thu, 1 Jun 2017 16:52:32 +0000 (16:52 +0000)]
Merge "Move appName inside Downloadrequest."
Treehugger Robot [Thu, 1 Jun 2017 13:34:14 +0000 (13:34 +0000)]
Merge "Prettify the captive portal sign-in activity"
Rebecca Silberstein [Wed, 10 May 2017 05:58:01 +0000 (22:58 -0700)]
WifiManager: add unspecified ip mode
Add an unspecified IP mode that allows WifiServiceImpl to clear state
in the interface-based IP mode tracking.
Bug:
31466854
Test: frameworks/base/wifi/tests/runtests.sh
Merged-In: I0d1db7ecb9cf7edd74d95f73d88b23571b87a27f
Merged-In: Iaa1474bd24d63e957ae82745b66c7571a5f18433
Change-Id: I15485cdab95ed4308cf5c2877fba40eac82bf162
(cherry picked from commit
bf4754361877ad93a92bea64407974f26eb7c494)
Hugo Benichi [Wed, 17 May 2017 00:26:30 +0000 (09:26 +0900)]
Prettify the captive portal sign-in activity
- fuses url bar with activity header: url is now the subtitle
- url appears as text and not as editable content
- url only shows host name
- header style is the device default for Settings
- Material progress bar
- progress bar disappears at page load finished
- webview does not jump at page load finished
Bug:
62107381
Bug:
38197949
Test: tested by manually triggering the sign-in activity
Merged-In: Id75023acad04f444dbfc41de56814a09e70cc6f9
(cherry pick from commit
a206649a6f66f16cc56db2f4e32b846d9b03501c)
Change-Id: I5c3e5ebac18fef6611c215d04d88ffef67b2b640
Yohann Roussel [Thu, 1 Jun 2017 09:23:13 +0000 (09:23 +0000)]
Merge "Add tests on MultiDex.installInstrumentation"
Treehugger Robot [Thu, 1 Jun 2017 07:50:35 +0000 (07:50 +0000)]
Merge "Add a tethering offload settings kill switch"
Treehugger Robot [Thu, 1 Jun 2017 06:53:25 +0000 (06:53 +0000)]
Merge "HFP: Allow SCO audio to be forcibly connected"
Robert Greenwalt [Fri, 19 May 2017 19:30:22 +0000 (12:30 -0700)]
Move appName inside Downloadrequest.
Simplifies vendor API.
Test: builds
Change-Id: I1e59e8014aa0fe1c0d46bca3347f428347fa0365
Jack He [Wed, 10 May 2017 00:16:01 +0000 (17:16 -0700)]
HFP: Allow SCO audio to be forcibly connected
* Normally, Android only allows SCO audio to be connected in several
allowed cases (e.g. in call, in ringing, in virtual call state, etc)
* Sometimes, it is necessary to force a SCO audio connection (e.g.
during PTS test)
* This change adds setForceScoAudio(boolean) hidden, system only method
to allow such behaviour
Bug:
38040125
Test: PTS HFP tests
Change-Id: I28f295c98da5bebb837c2a5423c7acde81af73f7
Treehugger Robot [Wed, 31 May 2017 21:33:55 +0000 (21:33 +0000)]
Merge "Added video calling data usage per-uid support"
Jack Yu [Fri, 26 May 2017 23:08:22 +0000 (16:08 -0700)]
Added video calling data usage per-uid support
Now the VT call data usage will be counted under
current dialer's data usage as well as the total
device data usage.
Test: Manual
bug:
37671326
Merged-In: I8351e9ae17c84210f7ca6c319d3bddcbb0043341
Change-Id: I8351e9ae17c84210f7ca6c319d3bddcbb0043341
Treehugger Robot [Wed, 31 May 2017 12:56:55 +0000 (12:56 +0000)]
Merge "Fix race condition in NsdManagerTest"
Treehugger Robot [Wed, 31 May 2017 12:25:38 +0000 (12:25 +0000)]
Merge "Fix TaskRecord wrong dump element firstActiveTime"
Narayan Kamath [Wed, 31 May 2017 11:55:47 +0000 (11:55 +0000)]
Merge "jni: Track debuggerd API changes."
Treehugger Robot [Wed, 31 May 2017 11:42:26 +0000 (11:42 +0000)]
Merge "AndroidRuntime: Add flag to support tombstoned aided stack dumps."
Erik Kline [Wed, 31 May 2017 01:21:32 +0000 (10:21 +0900)]
Add a tethering offload settings kill switch
Check for tether_offload_disabled (defaulting to false if not present)
before starting the OffloadController.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
29337859
Bug:
32163131
Bug:
34361337
Change-Id: Ifcc0eb1a41f09ad9e717c9252d2d55e69789669b
Narayan Kamath [Thu, 25 May 2017 14:44:51 +0000 (15:44 +0100)]
jni: Track debuggerd API changes.
android_os_Debug calls dump_backtrace_to_file_timeout which
now needs an additional argument that specifies the dump type.
Bug:
32064548
Test: make
Change-Id: Ic4047f4117fee0829d4cb8b1d47ad688b33001dc
Narayan Kamath [Wed, 10 May 2017 17:56:12 +0000 (18:56 +0100)]
AndroidRuntime: Add flag to support tombstoned aided stack dumps.
We introduce a new property dalvik.vm.stack-trace-dir that indicates
that we're using one trace file per dump. The runtime does not need
to know what the directory is, since it will communicate with
tombstoned in order to obtain a file descriptor to which it will write
its traces. In this change, we set the -Xtombstonedtraces flag whenever
dalvik.vm.stack-trace-dir is set.
Test: Manual
Bug:
32064548
Change-Id: I05984e91658250ad8379b821ca31649f13868580
Hugo Benichi [Wed, 31 May 2017 06:31:59 +0000 (15:31 +0900)]
Fix race condition in NsdManagerTest
NsdManagerTest relies on the lastMessage variable to assert the
connection of a client to the service. The asserts in test are done on a
different thread, although the variable was not qualified volatile,
which creates the chance to read a stale value. This patch fixes this
race by marking the variable volatile.
Bug:
32561414
Bug:
62044295
Test: NsdManagerTest works
Change-Id: I0bc2cd8059c6ff8b78a2dda0ba8d6bc7e13ef951
Treehugger Robot [Wed, 31 May 2017 03:43:37 +0000 (03:43 +0000)]
Merge "ConnectivityServiceTest: more tweaks to testRequestBenchmark"
Hugo Benichi [Mon, 29 May 2017 04:13:52 +0000 (13:13 +0900)]
ConnectivityServiceTest: more tweaks to testRequestBenchmark
Recent continuous testing runs indicates that commit
849b81b7 did not
completely fixed the issue with testRequestBenchmark.
This patch changes the name of the test to not include "test" and
removes @SmallTest annotation, which should do the job of @Ignore while
ConnectivityServiceTest still extends AndroidTestCase.
In addition timeouts are adjusted to take into account recent failures
observed.
This is the last pending action before turning on FrameworksNetTests on
presubmits.
Bug:
32561414
Test: no functional change
Change-Id: I56ef334e19e99e5a3483418330e5f0ccd6eb31bb
Treehugger Robot [Wed, 31 May 2017 01:13:05 +0000 (01:13 +0000)]
Merge "Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals"
Treehugger Robot [Tue, 30 May 2017 22:21:12 +0000 (22:21 +0000)]
Merge "Allow ManagedProvisioning to silently uninstall apps"
Treehugger Robot [Tue, 30 May 2017 21:35:11 +0000 (21:35 +0000)]
Merge "use FgThread.class instead of UiThread.class for lock object"
Colin Cross [Tue, 30 May 2017 17:57:34 +0000 (10:57 -0700)]
Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals
Instead of directly adding dependencies to full_classes_compiled_jar
and full_classes_jack, just use LOCAL_ADDITIONAL_DEPENDENCIES and
let the build system take care of where the dependencies are needed.
Test: builds
Change-Id: Ia3078fe0aa54b2d69821a9879cfe43414e1e9c4f
daqi [Tue, 30 May 2017 07:37:23 +0000 (15:37 +0800)]
Fix TaskRecord wrong dump element firstActiveTime
[Cause of Defect]
Used wrong class field.
Test: manual - adb shell dumpsys activity a
Change-Id: I6f54e374709b6ae60f8adabd5c29a1f100941c42
Signed-off-by: daqi <daqi@xiaomi.com>
Erik Kline [Mon, 29 May 2017 08:33:09 +0000 (08:33 +0000)]
Merge "Support "dumpsys connectivity tethering""
Joel Scherpelz [Mon, 29 May 2017 03:28:00 +0000 (03:28 +0000)]
Merge "Support requesting and receiving wakeup events"
Erik Kline [Mon, 29 May 2017 00:11:03 +0000 (09:11 +0900)]
Support "dumpsys connectivity tethering"
Also print current upstream interface in tethering dump output.
Test: as follows
- build
- flashed
- booted
- runtest frameworks-net passes
- "dumpsys connectivity tethering" shows just tethering info
Bug:
32163131
Bug:
36504926
Bug:
36988090
Bug:
38152109
Bug:
38186915
Bug:
38218697
Change-Id: I7f185fd71946a032e7f815207016294892df135d
Joel Scherpelz [Mon, 22 May 2017 04:47:41 +0000 (13:47 +0900)]
Support requesting and receiving wakeup events
Test: as follows
- built
- flashed
- booted
- ConnectivityServiceTest passes
Bug:
28806131
Change-Id: Ifc45260d5315479393da2c859ba4afed4e0e8c85
Erik Kline [Sun, 28 May 2017 11:06:39 +0000 (11:06 +0000)]
Merge "Minor improvement in logging in TetheringConfiguration"
Erik Kline [Fri, 19 May 2017 01:10:41 +0000 (10:10 +0900)]
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
insight.lee [Mon, 8 May 2017 07:10:12 +0000 (16:10 +0900)]
Allow ManagedProvisioning to silently uninstall apps
1. During device owner provisioning, ManagedProvisioning uninstalls
non-required apps. Apps to remove are all system apps in the reference
device. On the other hand, OEM devices have several non system apps,
so ManagedProvisioning can not uninstall them and can not complete
device owner provisioning permarnently.
2. This commit allows ManagedProvisioning having
MANAGE_PROFILE_AND_DEVICE_OWNERS permission to uninstall non-required
apps silently.
Bug:
37681141
Test: manual
Signed-off-by : Sungmin Lee <insight.lee@lge.com>
Merged-In: I201b070f4bcf453a2ffb391600853c7e595aec5d
Change-Id: I201b070f4bcf453a2ffb391600853c7e595aec5d
Hall Liu [Sat, 27 May 2017 01:08:29 +0000 (01:08 +0000)]
Merge "Add new error codes in MbmsException"
Treehugger Robot [Fri, 26 May 2017 22:53:27 +0000 (22:53 +0000)]
Merge "Add 32 and 128 bit Service Data parsing."
Hall Liu [Fri, 26 May 2017 22:49:32 +0000 (15:49 -0700)]
Add new error codes in MbmsException
Test: builds
Change-Id: I523961f588ef5ada97e06f5a910875c123f97989
Treehugger Robot [Fri, 26 May 2017 22:20:56 +0000 (22:20 +0000)]
Merge "Make NFC AIDL callbacks oneway"
Treehugger Robot [Fri, 26 May 2017 22:07:37 +0000 (22:07 +0000)]
Merge "Add ID_LENGTH field for Empty type record"
Jakub Pawlowski [Fri, 26 May 2017 20:59:55 +0000 (13:59 -0700)]
Add 32 and 128 bit Service Data parsing.
Bug:
62078132
Change-Id: I79ff75cd5ccbe346dca79693b074ff3cd09112dd
Ruchi Kandoi [Fri, 28 Apr 2017 22:48:02 +0000 (15:48 -0700)]
Make NFC AIDL callbacks oneway
Test: Read NFC tags, Android Beam
Bug:
32288773
Change-Id: I6294ec29be2af8feb578e9bfd5e0770ad9c09cc0
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Yuka Anami [Mon, 15 May 2017 04:53:04 +0000 (13:53 +0900)]
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
Treehugger Robot [Fri, 26 May 2017 16:26:36 +0000 (16:26 +0000)]
Merge "WifiManager: add iface name and mode labels"
Rebecca Silberstein [Thu, 25 May 2017 08:53:08 +0000 (01:53 -0700)]
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
4ac2cab8fd8cb6ef877f4e5c37f554f1a09b79dc)
Treehugger Robot [Fri, 26 May 2017 10:07:25 +0000 (10:07 +0000)]
Merge "Support registration of offload control callbacks."
Nicolas Geoffray [Fri, 26 May 2017 08:00:40 +0000 (08:00 +0000)]
Merge "Pass bootComplete to dexopt."
Erik Kline [Tue, 25 Apr 2017 10:19:59 +0000 (19:19 +0900)]
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
Hugo Benichi [Fri, 26 May 2017 00:34:03 +0000 (00:34 +0000)]
Merge changes If4deb106,Ib25d7658
* changes:
NsdService: do not use ContentResolver directly
@Ignore ConnectivityServiceTest#testRequestBenchmark
Brad Ebinger [Thu, 25 May 2017 22:31:51 +0000 (22:31 +0000)]
Merge "Add IMEI_NOT_ACCEPTED error code for IMS"
Hugo Benichi [Thu, 25 May 2017 04:49:32 +0000 (13:49 +0900)]
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
Hugo Benichi [Thu, 25 May 2017 04:42:31 +0000 (13:42 +0900)]
@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
Treehugger Robot [Thu, 25 May 2017 16:28:41 +0000 (16:28 +0000)]
Merge "HIDL: C++ Java parity"
Nicolas Geoffray [Thu, 25 May 2017 12:53:22 +0000 (13:53 +0100)]
Pass bootComplete to dexopt.
bug:
37165062
Test: After OTA, check bootComplete=false on package updates
Change-Id: I6fc00216020bb16d8ed4f6e839b5e1df0e942700
Neil Fuller [Thu, 25 May 2017 10:39:14 +0000 (10:39 +0000)]
Merge "Remove time_zones_by_country.xml file"
Hugo Benichi [Thu, 25 May 2017 00:50:24 +0000 (00:50 +0000)]
Merge "NsdServiceInfo: move test to tests/net"
Joel Scherpelz [Wed, 24 May 2017 23:54:21 +0000 (23:54 +0000)]
Merge "Ignore flow label when comparing RAs in APF"
Tyler Gunn [Wed, 24 May 2017 22:36:41 +0000 (22:36 +0000)]
Merge "Add ability to dump events in a timeline view."
Brad Ebinger [Wed, 24 May 2017 20:19:29 +0000 (20:19 +0000)]
Merge "Support RRO for emergency number conversion map"
Neil Fuller [Fri, 31 Mar 2017 12:05:01 +0000 (13:05 +0100)]
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
Treehugger Robot [Wed, 24 May 2017 14:28:48 +0000 (14:28 +0000)]
Merge "[NotificationManagerService]Support multi users to notification pulse"
Paul Duffin [Wed, 24 May 2017 08:01:36 +0000 (08:01 +0000)]
Merge "Fixed nfc-extras build files"
Hugo Benichi [Wed, 24 May 2017 06:39:39 +0000 (15:39 +0900)]
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
Treehugger Robot [Wed, 24 May 2017 06:47:29 +0000 (06:47 +0000)]
Merge "Move NsdServiceTest to correct directory"
Joel Scherpelz [Wed, 24 May 2017 06:08:39 +0000 (15:08 +0900)]
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
Hugo Benichi [Wed, 24 May 2017 05:16:55 +0000 (14:16 +0900)]
Move NsdServiceTest to correct directory
Test: no functional change
Bug:
62044295
Change-Id: Iad3af646e8d252f84978d1a367878a78c2869982
Treehugger Robot [Wed, 24 May 2017 01:51:04 +0000 (01:51 +0000)]
Merge "Fix up upstream interface types for case DUN_UNSPECIFIED"
Steven Moreland [Tue, 23 May 2017 19:45:16 +0000 (12:45 -0700)]
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
Jayachandran C [Thu, 18 May 2017 06:53:59 +0000 (23:53 -0700)]
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
Treehugger Robot [Tue, 23 May 2017 20:34:54 +0000 (20:34 +0000)]
Merge "Consider the last inserted SIM for EmergencyAffordance"
Dan Willemsen [Tue, 23 May 2017 16:58:46 +0000 (16:58 +0000)]
Merge "Fix makefile warning."
Hugo Benichi [Tue, 23 May 2017 11:29:47 +0000 (11:29 +0000)]
Merge "Fix NetworkStatsObserversTest"
Paul Duffin [Mon, 22 May 2017 14:58:56 +0000 (15:58 +0100)]
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
Treehugger Robot [Tue, 23 May 2017 10:31:57 +0000 (10:31 +0000)]
Merge "NetworkManagementService.java: fix error-prone warnings"
Hugo Benichi [Tue, 23 May 2017 06:43:06 +0000 (06:43 +0000)]
Merge "Fix NetworkStatsAccessTest"
Treehugger Robot [Tue, 23 May 2017 06:16:47 +0000 (06:16 +0000)]
Merge "ConnectivityManager: simplify callback handler"
Tomasz Wasilczyk [Tue, 11 Apr 2017 18:06:34 +0000 (11:06 -0700)]
Fix makefile warning.
Test: it builds.
Bug: b/
37159108
Change-Id: I73c09c8eeb0bab5f506c3d81072cc80c71f63779
Merged-In: I73c09c8eeb0bab5f506c3d81072cc80c71f63779
Treehugger Robot [Tue, 23 May 2017 04:44:22 +0000 (04:44 +0000)]
Merge "Refactor TISM add/remove code"
Hugo Benichi [Tue, 23 May 2017 04:35:08 +0000 (04:35 +0000)]
Merge "ConnectivityServiceTest: fix flakyness"
Treehugger Robot [Tue, 23 May 2017 03:14:29 +0000 (03:14 +0000)]
Merge "ConnectivityManager: improve argument validation"
Hugo Benichi [Tue, 9 May 2017 05:36:02 +0000 (14:36 +0900)]
ConnectivityManager: simplify callback handler
Bug:
36701874
Test: $ runtest frameworks-net
Change-Id: I4d5f08903a54f8dced7cb6ae86703847b908b784
Hugo Benichi [Tue, 9 May 2017 06:19:01 +0000 (15:19 +0900)]
ConnectivityManager: improve argument validation
Using Preconditions and dedicated static methods for checking arguments
to improve error stack traces without error messages.
Test: covered by previously added unit test
Bug:
36701874
Change-Id: Id872b2c887a4bca43a8c3644622add1c2ee57c6d
Hugo Benichi [Mon, 22 May 2017 06:09:25 +0000 (15:09 +0900)]
Fix NetworkStatsObserversTest
This patch fixes several spurious unit tests in
NetworkStatsObserversTest by using the updated waitForIdleHandler of
ConnectivityServiceTest. More specifically this fixes the following
tests:
- testUnregister_knownRequest_releasesCaller
- testUpdateStats_deviceAccess_notifies
- testUpdateStats_userAccess_usageSameUser_notifies
- testUpdateStats_defaultAccess_notifiesSameUid
This patch also removes the dummy message with type -1 sent at the end
of tests in NetworkStatsObserversTest and the associated assert, because
nothing is exercised or asserted immediately after.
This patch also updates NetworkStatsObserversTest to not depend on the
deprecated junit.framework.TestCase.
Bug:
32561414
Test: runtest -x frameworks/base/tests/../NetworkStatsObserversTest.java
Change-Id: I4fc909ee9bacc964c859fa7a3db34f9dc86b89cf
Hugo Benichi [Mon, 22 May 2017 05:33:05 +0000 (14:33 +0900)]
Fix NetworkStatsAccessTest
This patch fixes NetworkStatsAccessTest by taking into account
DEVICESUMMARY which was added in commit
3a8b343ce5220086c4f71e63f5d42f2d28434c4b.
Doing $ git revert
3a8b343ce5220086c4f71e63f5d42f2d28434c4b shows that
the existing assertions of NetworkStatsAccessTest passed before that
commit.
This patch also changes NetworkStatsAccessTest to use up-to-date testing
style and not depend on the deprecated junit.framework.TestCase.
Bug:
32561414
Test: runtest -x frameworks/base/../NetworkStatsAccessTest.java
Change-Id: Ib78f137578cf35e1c766b377b7f812a09173c49e