OSDN Git Service
Narayan Kamath [Wed, 31 May 2017 12:06:35 +0000 (12:06 +0000)]
Merge "jni: Track debuggerd API changes."
am:
d29f144836
Change-Id: I0a538cdcb94c2f79c371df0c60af1e1234279f5b
Narayan Kamath [Wed, 31 May 2017 11:55:47 +0000 (11:55 +0000)]
Merge "jni: Track debuggerd API changes."
Narayan Kamath [Wed, 31 May 2017 11:52:39 +0000 (11:52 +0000)]
Merge "AndroidRuntime: Add flag to support tombstoned aided stack dumps."
am:
41f23d645c
Change-Id: I900bf1adcb6bf449f6db49a34ce5a9bb26af6001
Treehugger Robot [Wed, 31 May 2017 11:42:26 +0000 (11:42 +0000)]
Merge "AndroidRuntime: Add flag to support tombstoned aided stack dumps."
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 03:52:05 +0000 (03:52 +0000)]
Merge "ConnectivityServiceTest: more tweaks to testRequestBenchmark"
am:
76efbb30f5
Change-Id: I2c7e714af44c31a101fd58be6ebcc540fffd65a1
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
Colin Cross [Wed, 31 May 2017 01:22:00 +0000 (01:22 +0000)]
Merge "Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals"
am:
a4982eb5dd
Change-Id: Ic7700b1974d2d3aa3df0c55003ee6c16c1ba6ece
Treehugger Robot [Wed, 31 May 2017 01:13:05 +0000 (01:13 +0000)]
Merge "Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals"
insight.lee [Tue, 30 May 2017 22:34:47 +0000 (22:34 +0000)]
Merge "Allow ManagedProvisioning to silently uninstall apps"
am:
cfc68b6661
Change-Id: I2fed72cf026733b8976b4b8a113d1eb0db27fcaa
Treehugger Robot [Tue, 30 May 2017 22:21:12 +0000 (22:21 +0000)]
Merge "Allow ManagedProvisioning to silently uninstall apps"
yangbingqian [Tue, 30 May 2017 21:48:15 +0000 (21:48 +0000)]
Merge "use FgThread.class instead of UiThread.class for lock object"
am:
e2fddf56a4
Change-Id: Ia6d2154bf46d61ea55ef7e41abd538b1c71972b5
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
Erik Kline [Mon, 29 May 2017 08:42:04 +0000 (08:42 +0000)]
Merge "Support "dumpsys connectivity tethering""
am:
6cdcba7b48
Change-Id: I91ef704d3fda346a50016841f40fecce2e23d215
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:33:08 +0000 (03:33 +0000)]
Merge "Support requesting and receiving wakeup events"
am:
bf152b14c4
Change-Id: I594d4b5921ec6f0f8f73b88fd4d0e06278838553
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:16:32 +0000 (11:16 +0000)]
Merge "Minor improvement in logging in TetheringConfiguration"
am:
39ce589f0b
Change-Id: I1d61308cf21f3c4ebcc37f78bdd102f96a676462
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:18:33 +0000 (01:18 +0000)]
Merge "Add new error codes in MbmsException"
am:
8e7057ccf3
Change-Id: Ie8bf825d1fe7c40c94abd0245e69d597afb2f9bc
Hall Liu [Sat, 27 May 2017 01:08:29 +0000 (01:08 +0000)]
Merge "Add new error codes in MbmsException"
Jakub Pawlowski [Fri, 26 May 2017 23:02:45 +0000 (23:02 +0000)]
Merge "Add 32 and 128 bit Service Data parsing."
am:
725e212de3
Change-Id: I5a5010651b07f2a9c5d1fb25f55602ed5e741d56
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
Ruchi Kandoi [Fri, 26 May 2017 22:30:16 +0000 (22:30 +0000)]
Merge "Make NFC AIDL callbacks oneway"
am:
99c805b319
Change-Id: I964420fc36c67b9f96e286e1a8b9b54eda074189
Treehugger Robot [Fri, 26 May 2017 22:20:56 +0000 (22:20 +0000)]
Merge "Make NFC AIDL callbacks oneway"
Yuka Anami [Fri, 26 May 2017 22:17:15 +0000 (22:17 +0000)]
Merge "Add ID_LENGTH field for Empty type record"
am:
b1f0bb6f83
Change-Id: Ib63ba83f912f2047ec5bd795b57da423c1e78f59
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
Rebecca Silberstein [Fri, 26 May 2017 16:37:21 +0000 (16:37 +0000)]
Merge "WifiManager: add iface name and mode labels"
am:
21cc4bcd01
Change-Id: Ia715be047c0e1c3ef5ea5d38d013276cf5a3eacc
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)
Erik Kline [Fri, 26 May 2017 10:16:26 +0000 (10:16 +0000)]
Merge "Support registration of offload control callbacks."
am:
7ee96625c2
Change-Id: Ica4f51762b577e3868e87622df3963cd89daacae
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:07:58 +0000 (08:07 +0000)]
Merge "Pass bootComplete to dexopt."
am:
18c3201986
Change-Id: I5d73692a887ef8f3fff888c310f9969d79ada970
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:43:06 +0000 (00:43 +0000)]
Merge changes If4deb106,Ib25d7658
am:
0388f0e47b
Change-Id: Id10b2a80388aff2307cefd95ffb5f2b4df5fbdc3
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:51:11 +0000 (22:51 +0000)]
Merge "Add IMEI_NOT_ACCEPTED error code for IMS"
am:
25ce41cf4c
Change-Id: Ic24b93e215995a18e1a2ecbb647af0cc8e1f67cb
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
Steven Moreland [Thu, 25 May 2017 16:34:21 +0000 (16:34 +0000)]
Merge "HIDL: C++ Java parity"
am:
475d9b283c
Change-Id: I8195a0a4de291f26c637f5cd6802d6bbaf0d17a3
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:46:41 +0000 (10:46 +0000)]
Merge "Remove time_zones_by_country.xml file"
am:
3436fd4833
Change-Id: I75cf86290b0dcc5aa99b9d0ebacbc5aa07269aab
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 01:01:15 +0000 (01:01 +0000)]
Merge "NsdServiceInfo: move test to tests/net"
am:
48859e01d5
Change-Id: I3e864d744b956eff62512419018dd7cd5f692333
Hugo Benichi [Thu, 25 May 2017 00:50:24 +0000 (00:50 +0000)]
Merge "NsdServiceInfo: move test to tests/net"
Joel Scherpelz [Thu, 25 May 2017 00:04:12 +0000 (00:04 +0000)]
Merge "Ignore flow label when comparing RAs in APF"
am:
81fda77884
Change-Id: Id1a51e03e5065cabb4645d1e05f5e22ab4e98c0a
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:45:55 +0000 (22:45 +0000)]
Merge "Add ability to dump events in a timeline view."
am:
255a171c5d
Change-Id: I7bb01946685f4e9c5b60fd0e8e2be4b071fd1a6f
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:27:48 +0000 (20:27 +0000)]
Merge "Support RRO for emergency number conversion map"
am:
671680e504
Change-Id: I74cc3235e07116f2f1e03f24f5ea51b73a86af82
Brad Ebinger [Wed, 24 May 2017 20:19:29 +0000 (20:19 +0000)]
Merge "Support RRO for emergency number conversion map"
zhoulei [Wed, 24 May 2017 14:37:32 +0000 (14:37 +0000)]
Merge "[NotificationManagerService]Support multi users to notification pulse"
am:
8516a2025a
Change-Id: I1a2bb68ba34c48261d1c990445b0735d2449e21e
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:11:37 +0000 (08:11 +0000)]
Merge "Fixed nfc-extras build files"
am:
d3ff45985a
Change-Id: I4786af397c556c72d1f7ac9ff7d762fa3efcf90b
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
Hugo Benichi [Wed, 24 May 2017 06:59:02 +0000 (06:59 +0000)]
Merge "Move NsdServiceTest to correct directory"
am:
0a76f99621
Change-Id: I37b614bec6dc4a9da55024c534dbfc9459e2764a
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
Jayachandran C [Wed, 24 May 2017 02:01:12 +0000 (02:01 +0000)]
Merge "Fix up upstream interface types for case DUN_UNSPECIFIED"
am:
485d103083
Change-Id: I8e7c513b206cbc5f19d582ec48e529ce067e2aa9
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
Ruthwar Kumar Ambeer [Tue, 23 May 2017 20:43:10 +0000 (20:43 +0000)]
Merge "Consider the last inserted SIM for EmergencyAffordance"
am:
65d3a457d2
Change-Id: I3b7bfb3963b61c4589811e8c27e4f89ff501096e
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 17:12:03 +0000 (17:12 +0000)]
Merge "Fix makefile warning."
am:
f523227a6e
Change-Id: I852b00eb0c562003307507d02e1dd80a7d42cf9f
Dan Willemsen [Tue, 23 May 2017 16:58:46 +0000 (16:58 +0000)]
Merge "Fix makefile warning."
Hugo Benichi [Tue, 23 May 2017 11:37:37 +0000 (11:37 +0000)]
Merge "Fix NetworkStatsObserversTest"
am:
0dc35fa969
Change-Id: I9b4e83b4e437089ea500d82990e59558ff55e02a
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
Andrew Scull [Tue, 23 May 2017 10:40:38 +0000 (10:40 +0000)]
Merge "NetworkManagementService.java: fix error-prone warnings"
am:
44b7e94a7c
Change-Id: I7cade535f2bca308446aa91d4368ee41b62daa9b
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:51:15 +0000 (06:51 +0000)]
Merge "Fix NetworkStatsAccessTest"
am:
ec1f25a4ba
Change-Id: If949493d9967fa723667947979262bf4f90841c2
Hugo Benichi [Tue, 23 May 2017 06:43:06 +0000 (06:43 +0000)]
Merge "Fix NetworkStatsAccessTest"
Hugo Benichi [Tue, 23 May 2017 06:24:16 +0000 (06:24 +0000)]
Merge "ConnectivityManager: simplify callback handler"
am:
857e7d9c85
Change-Id: I8d5371b69fcec3f1f625923eb65191b4c018bb00
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
Erik Kline [Tue, 23 May 2017 04:56:40 +0000 (04:56 +0000)]
Merge "Refactor TISM add/remove code"
am:
5041bbde19
Change-Id: I2475a3cbff37248509e21dd058ed8f3d827fefd0
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:42:40 +0000 (04:42 +0000)]
Merge "ConnectivityServiceTest: fix flakyness"
am:
a82cac1452
Change-Id: I241192b2d9565c41f47bbe6227b50049898da679
Hugo Benichi [Tue, 23 May 2017 04:35:08 +0000 (04:35 +0000)]
Merge "ConnectivityServiceTest: fix flakyness"
Hugo Benichi [Tue, 23 May 2017 03:20:33 +0000 (03:20 +0000)]
Merge "ConnectivityManager: improve argument validation"
am:
cdfd3a186f
Change-Id: I3adb40fe1bd1779d745bb122da06e33068ce48a3
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