OSDN Git Service
Carlos Vinueza [Tue, 25 Jul 2017 16:27:10 +0000 (16:27 +0000)]
Merge "Adding 4 standard short codes required by Android Constellation"
am:
d00de318f9
Change-Id: Ib17b53a72e737a7b584c65b63c89bd7524c1a2c4
Treehugger Robot [Tue, 25 Jul 2017 16:12:23 +0000 (16:12 +0000)]
Merge "Adding 4 standard short codes required by Android Constellation"
Neil Fuller [Tue, 25 Jul 2017 14:54:46 +0000 (14:54 +0000)]
Merge "Remove TODO related to WakeLocks"
am:
12d08bf9a0
Change-Id: Id94118a9b687493f6f6879bf6bbe23cfad86dfa9
Treehugger Robot [Tue, 25 Jul 2017 14:42:40 +0000 (14:42 +0000)]
Merge "Remove TODO related to WakeLocks"
Hugo Benichi [Tue, 25 Jul 2017 14:33:45 +0000 (14:33 +0000)]
Merge "Bootstrap IpReachabilityMonitor unit tests"
am:
a9889c94aa
Change-Id: Ic3b145159a4c0430cc248a19b8527af40fa67696
Treehugger Robot [Tue, 25 Jul 2017 13:05:47 +0000 (13:05 +0000)]
Merge "Bootstrap IpReachabilityMonitor unit tests"
Neil Fuller [Tue, 25 Jul 2017 12:14:32 +0000 (13:14 +0100)]
Remove TODO related to WakeLocks
There's no need to keep a WakeLock in the RulesManager - if
the device goes to sleep it should continue the work when
it wakes up again. All I/O is handled via AtomicFile and should
be robust to corruption, etc. and this reduces the likelihood
of issues caused by sudden sleeps.
Bug:
31008728
Test: make
Change-Id: I3d5076ca7d2f39076f76bdb745cedde214eac21b
Hugo Benichi [Mon, 24 Jul 2017 00:30:52 +0000 (09:30 +0900)]
Bootstrap IpReachabilityMonitor unit tests
Bug:
62918393
Test: runtest frameworks-net
Change-Id: I236029f460dc3631ef9f5d8312dc1c6faf9807df
ludi [Tue, 25 Jul 2017 03:07:00 +0000 (03:07 +0000)]
Merge "Add dump info to IpSecService"
am:
ec5fc4872e
Change-Id: Idd4c051e4536d32504718fdfd201c7effdeb62e3
Treehugger Robot [Tue, 25 Jul 2017 02:38:47 +0000 (02:38 +0000)]
Merge "Add dump info to IpSecService"
Andreas Gampe [Tue, 25 Jul 2017 00:18:19 +0000 (00:18 +0000)]
Merge "Zygote: Increase wrap-pid timeout to thirty seconds"
am:
81f66ce5ab
Change-Id: I1cc8856ebb68ee83a8d3e62d86b48d497d0eb237
Treehugger Robot [Tue, 25 Jul 2017 00:06:02 +0000 (00:06 +0000)]
Merge "Zygote: Increase wrap-pid timeout to thirty seconds"
ludi [Mon, 22 May 2017 17:52:23 +0000 (10:52 -0700)]
Add dump info to IpSecService
Bug:
38350824
Test: runtest frameworks-net
Change-Id: Ifa11d55e9d337016ad865baada627db3aa8c2db3
Shubham Ajmera [Mon, 24 Jul 2017 22:21:04 +0000 (15:21 -0700)]
Update DexFile#getDexOptNeeded usages to reflect API change
Test: make and boot
Merged-in: I68f9f617d6722a7ba8b00aa2181cb38a165cfc51
Bug:
36598475
(partially cherry-picked from commit
246dccf9327631597767afe418ce43ae6d07d102)
Change-Id: Idfc9276eb2b61244bbd634f49a3912dab6fcabfa
Shubham Ajmera [Mon, 24 Jul 2017 20:07:27 +0000 (20:07 +0000)]
Merge "Update DexFile#getDexOptNeeded usages to reflect API change"
am:
515e6443aa -s ours
Change-Id: I5553eaa94705b4dd3f3bde0d5a7a6acb23826f84
Shubham Ajmera [Mon, 24 Jul 2017 19:11:29 +0000 (19:11 +0000)]
Merge "Update DexFile#getDexOptNeeded usages to reflect API change"
Carlos Vinueza [Thu, 20 Jul 2017 23:40:35 +0000 (16:40 -0700)]
Adding 4 standard short codes required by Android Constellation
This set is last minute addition to the whitelist free short code batch
2017 Q2 - Android Partner Engineering
Includes 4 country wide SMS standard short codes required by the
Constellation team.
Test: manual - uploaded modified file onto test device and tested
sending SMS to changed shortcodes to verify behaviour.
Bug:
37355429
Change-Id: Iffad649a74dcc7afd6a3574a92825d309df2d3ba
Signed-off-by: Carlos Vinueza <chinesco@google.com>
Andreas Gampe [Fri, 21 Jul 2017 18:41:00 +0000 (11:41 -0700)]
Zygote: Increase wrap-pid timeout to thirty seconds
Some lowend devices under heavy instrumentation may not be able to
send the pid in the current five seconds. Drop the safety and
ignore watchdog debug builds, and move the timeout to thirty seconds.
Make the ZygoteConnection constants sharable in their own @hide class.
Add an assert into the watchdog that the wait time is less than the
watchdog time on non-debug builds.
Bug:
63904739
Bug:
63638768
Test: m
Test: manual test
Test: cts-tradefed run commandAndExit cts-dev -m CtsWrapWrapDebugTestCases
Change-Id: I80abdda54cd94e935de5a52b9f3c9192d0e31060
Hugo Benichi [Mon, 24 Jul 2017 11:34:40 +0000 (11:34 +0000)]
Merge "CaptivePortalLoginActivity: improve logging"
am:
c0a4f5357e
Change-Id: I475b58f1a6146f0faf4ddf90f44e032ee6c3120f
Treehugger Robot [Mon, 24 Jul 2017 11:21:21 +0000 (11:21 +0000)]
Merge "CaptivePortalLoginActivity: improve logging"
Love Khanna [Wed, 17 May 2017 10:22:16 +0000 (15:52 +0530)]
NFC DTA Integration
Test: compiles.
Merged-In: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Steven Moreland [Fri, 21 Jul 2017 23:27:27 +0000 (23:27 +0000)]
Merge "Revert "Revert "Update for less arguments in hidl toBinder."""
am:
e8341b6148
Change-Id: I1337a9b40fdf762cc0150983536981f0a163750a
Treehugger Robot [Fri, 21 Jul 2017 23:18:09 +0000 (23:18 +0000)]
Merge "Revert "Revert "Update for less arguments in hidl toBinder."""
Shubham Ajmera [Wed, 19 Jul 2017 00:12:21 +0000 (17:12 -0700)]
Update DexFile#getDexOptNeeded usages to reflect API change
Test: make and boot
Merged-in: I68f9f617d6722a7ba8b00aa2181cb38a165cfc51
Bug:
36598475
(partially cherry-picked from commit
246dccf9327631597767afe418ce43ae6d07d102)
Change-Id: If90690d6234dc8727df2b2fb485f0c8d50970a92
Steven Moreland [Fri, 21 Jul 2017 19:29:54 +0000 (19:29 +0000)]
Revert "Revert "Update for less arguments in hidl toBinder.""
This reverts commit
243bcfda3ac35735a959f8abcc45186aba0af116.
(originally reverted due to merge conflicts)
Bug:
32172906
Test: hidl_test
Change-Id: I70fde3ffe0d2c67390f7152acedd45c39009a134
Hall Liu [Fri, 21 Jul 2017 21:18:42 +0000 (21:18 +0000)]
Merge "Make slight API and doc adjustments"
am:
b7e10650d8
Change-Id: I96a361924ddff300eb36933bed67d30ec00e8f87
Hall Liu [Fri, 21 Jul 2017 21:09:34 +0000 (21:09 +0000)]
Merge "Make slight API and doc adjustments"
Steven Moreland [Fri, 21 Jul 2017 19:28:14 +0000 (19:28 +0000)]
Merge "Revert "Update for less arguments in hidl toBinder.""
am:
79994cb142
Change-Id: I325335a278fc9aebf7957e23089c72665169eeb3
Steven Moreland [Fri, 21 Jul 2017 19:14:24 +0000 (19:14 +0000)]
Merge "Revert "Update for less arguments in hidl toBinder.""
Steven Moreland [Fri, 21 Jul 2017 19:13:05 +0000 (19:13 +0000)]
Revert "Update for less arguments in hidl toBinder."
This reverts commit
de2a9dfe3a7f343d4c1568d644ae0ddce7725a8d.
Change-Id: I6f451b0a05759501f59921747d95c6ae5b7ce656
Steven Moreland [Fri, 21 Jul 2017 18:13:01 +0000 (18:13 +0000)]
Merge "Update for less arguments in hidl toBinder."
am:
602b7be04e
Change-Id: I61f30db7a638c8c74925509e0bee1a7fffd5c546
Love Khanna [Fri, 21 Jul 2017 17:56:59 +0000 (17:56 +0000)]
Merge "NFC DTA Integration"
am:
a42c8a1667 -s ours
Change-Id: I6edab80bee45eb4f95a36273857068487ff506b7
Treehugger Robot [Fri, 21 Jul 2017 17:49:39 +0000 (17:49 +0000)]
Merge "Update for less arguments in hidl toBinder."
Treehugger Robot [Fri, 21 Jul 2017 17:38:53 +0000 (17:38 +0000)]
Merge "NFC DTA Integration"
Love Khanna [Wed, 17 May 2017 10:22:16 +0000 (15:52 +0530)]
NFC DTA Integration
Test: compiles.
Merged-In: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Steven Moreland [Thu, 20 Jul 2017 16:24:56 +0000 (09:24 -0700)]
Update for less arguments in hidl toBinder.
Removed unnecessary templatization argument.
Test: hidl_test_java
Bug:
32172906
Change-Id: I88cd2bf7abc3065ece4e28698ba5e0d836b1d0e3
Hugo Benichi [Fri, 21 Jul 2017 08:15:20 +0000 (08:15 +0000)]
Merge "IpManagerTest: fix flaky test for real"
am:
e0a743d035
Change-Id: If1e0024d81bb24586f2cbd691e39a2d66f827c41
Treehugger Robot [Fri, 21 Jul 2017 08:07:40 +0000 (08:07 +0000)]
Merge "IpManagerTest: fix flaky test for real"
Hugo Benichi [Fri, 21 Jul 2017 05:12:26 +0000 (14:12 +0900)]
IpManagerTest: fix flaky test for real
Commit
c10fe5f46367 tried to fix the flaky unit test for a default
ProvisioningConfiguration but failed to reinitialize the mock class
involved, so that in practice the flaky assertion is as flaky as before.
This patch correctly resets the mock after the default assertions are
done once an IpManager object is created.
Bug:
32561414
Bug:
62918393
Test: runtest frameworks-net
Change-Id: I516b6981f96e83a90cb372a727c41f0b2ea59801
Hall Liu [Fri, 14 Jul 2017 20:39:54 +0000 (13:39 -0700)]
Make slight API and doc adjustments
* Fix a compile error on Java 7
* Update initialization mechanism to allow exceptions and return codes
* App-facing api for StreamingService#dispose no longer throws an
IllegalArgumentException
* Add REASON_NONE to stream state change reasons
Change-Id: I4710c6e56b35f74188f5877f0cf74b7773c1e9b7
Neil Fuller [Thu, 20 Jul 2017 18:25:10 +0000 (18:25 +0000)]
Merge "Logging improvements for time zone updates"
am:
2cae07284d
Change-Id: Ic9e4b16d66164447f4937cf59d90ca8ecc9568ce
Neil Fuller [Thu, 20 Jul 2017 17:58:12 +0000 (17:58 +0000)]
Merge "Logging improvements for time zone updates"
Neil Fuller [Thu, 20 Jul 2017 10:00:35 +0000 (11:00 +0100)]
Logging improvements for time zone updates
Logging improvements for time zone updates:
1) Add EventLog entries time zone update service interactions.
2) Add more information to dumpsys logs to improve debugging.
Unit tests run with:
make -j30 FrameworksServicesTests
adb install -r -g \
"out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w \
com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Bug:
31008728
Test: See above for unit testing.
Test: Internal xTS tests
Test: adb shell dumpsys timezone
Test: adb logcat -b events -v threadtime -v printable -v uid -d *:v
Change-Id: I9356f4694e60b49e4b06aadd632d1bad517b8a29
Di Lu [Thu, 20 Jul 2017 07:36:19 +0000 (07:36 +0000)]
Merge "Add unit test for IpSecService"
am:
9e3f886dca
Change-Id: I16fb89239e641ac39a8a7adeafd72b7fe03935ed
Di Lu [Thu, 20 Jul 2017 07:27:16 +0000 (07:27 +0000)]
Merge "Add unit test for IpSecService"
Di Lu [Thu, 20 Jul 2017 05:52:10 +0000 (05:52 +0000)]
Merge "Add unit test for IpSecManager"
am:
dd494fa91c
Change-Id: I56c336eb8234b31154b6a7defd95ce76ea0800d8
Di Lu [Thu, 20 Jul 2017 05:42:53 +0000 (05:42 +0000)]
Merge "Add unit test for IpSecManager"
Andreas Gampe [Thu, 20 Jul 2017 05:36:42 +0000 (05:36 +0000)]
Merge "Zygote: Poll with timeout for pid"
am:
89d119abe6
Change-Id: I704192c4a2e1d0509f0f3c19b42945f2c00669ed
Treehugger Robot [Thu, 20 Jul 2017 05:25:24 +0000 (05:25 +0000)]
Merge "Zygote: Poll with timeout for pid"
ludi [Fri, 12 May 2017 16:15:00 +0000 (09:15 -0700)]
Add unit test for IpSecService
Test: runtest frameworks-net
Bug:
38259578
Change-Id: I4a049d5fdec79e36692e3b12306bd0758c19ad75
Ahmed ElArabawy [Thu, 20 Jul 2017 03:46:08 +0000 (03:46 +0000)]
Merge "Add Configuration to APF Policy"
am:
d27a6d62c6
Change-Id: I491bad86e4e9ae7a813ac214b06273719a583079
Treehugger Robot [Thu, 20 Jul 2017 03:34:57 +0000 (03:34 +0000)]
Merge "Add Configuration to APF Policy"
Steven Moreland [Thu, 20 Jul 2017 02:50:53 +0000 (02:50 +0000)]
Merge "frameworks/base: use proper nativehelper headers"
am:
826eafd958
Change-Id: I36f10ff4d963284a313f1cc5b368f82549a4adb2
Andreas Gampe [Thu, 13 Jul 2017 02:17:52 +0000 (19:17 -0700)]
Zygote: Poll with timeout for pid
Do not use a blocking readInt. Poll for available bytes with a timeout.
(cherry picked from commit
cbc421406193308667a38b0bebc16c4064a19e83)
Bug:
63638768
Test: m
Test: cts-tradefed run commandAndExit cts-dev -m CtsWrapWrapDebugTestCases
Change-Id: Ib2131c00aa47dd10bb940d8678bbbfb5a0346ad5
Treehugger Robot [Thu, 20 Jul 2017 02:42:49 +0000 (02:42 +0000)]
Merge "frameworks/base: use proper nativehelper headers"
Ahmed ElArabawy [Tue, 13 Jun 2017 01:01:11 +0000 (18:01 -0700)]
Add Configuration to APF Policy
in b/
37702435 battery was drained due to reception of
Ethernet frames with Eth-type < 0x600 (non ehternet II frames)
This change adds an XML file to drop/allow these frames
Dropping helps tp avoid acquiring a wakelock for the
reception of these packets, while allowing them may be needed
for some protocols
The Change allow the OEM to override the system settings
Bug:
37702435
Test: runtest frameworks-net
Merged-In: Idb6c215896ef230a8136ff4ecefc90ccdc5c1c6d
Merged-In: I16346bb98a0b9259f7c3f51e318c472cfc1bb492
Signed-off-by: Ahmed ElArabawy <arabawy@google.com>
(cherry pick from commit
4dd7c58fc8fcc5a2c50de5e8eff05ddc5c3b0b8b)
Change-Id: Ie466baf1e6395d6c28245e41179232ea8e523845
ludi [Fri, 12 May 2017 16:15:00 +0000 (09:15 -0700)]
Add unit test for IpSecManager
Test: runtest frameworks-net
Bug:
38259578
Change-Id: Idb76aab899ccb7145bef2b7dce36e115c25fa6ca
Robert Greenwalt [Thu, 20 Jul 2017 00:30:50 +0000 (00:30 +0000)]
Merge "Add details to Download progress callback"
am:
b440b572d7
Change-Id: Idb7ebf8ec5d0b6b341c97dab05efc94e9e629011
Treehugger Robot [Thu, 20 Jul 2017 00:23:48 +0000 (00:23 +0000)]
Merge "Add details to Download progress callback"
Hall Liu [Wed, 19 Jul 2017 23:58:16 +0000 (23:58 +0000)]
Merge "Add timezone for Telecom event date formatting"
am:
bf296640e6
Change-Id: Ic9db643ff6d204f75aed44160003bbe0b685eb7e
Treehugger Robot [Wed, 19 Jul 2017 23:46:52 +0000 (23:46 +0000)]
Merge "Add timezone for Telecom event date formatting"
Robert Greenwalt [Sat, 17 Jun 2017 00:37:20 +0000 (17:37 -0700)]
Add details to Download progress callback
Split decode into max size and current size.
Test: builds
Change-Id: Ice18d7f0e9ae99b3c24fe10843da80abd0d912d7
Hall Liu [Wed, 19 Jul 2017 21:57:56 +0000 (14:57 -0700)]
Add timezone for Telecom event date formatting
Output event times in local time rather than in UTC for compatibility
with the rest of the timestamps in the bug report
Test: manual
Change-Id: I2d458f09aec635a43e3d0565e8f8da803124f368
George Burgess IV [Wed, 19 Jul 2017 17:36:23 +0000 (17:36 +0000)]
Merge "Fix static analyzer complaints"
am:
a3bde81205
Change-Id: I39f7b56c6abc0398cd517eef174b0620dbc50caa
Treehugger Robot [Wed, 19 Jul 2017 17:26:36 +0000 (17:26 +0000)]
Merge "Fix static analyzer complaints"
Steven Moreland [Wed, 19 Jul 2017 16:50:45 +0000 (09:50 -0700)]
frameworks/base: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: modules using frameworks/base find headers
Bug:
63762847
Change-Id: I0f9f231acdebe460f279135462f43d3e32eff64d
Carlos Vinueza [Wed, 19 Jul 2017 14:26:55 +0000 (14:26 +0000)]
Merge "Adding 26 free short codes for DCB and other purposes"
am:
1585b2e7b7
Change-Id: Ia85bdccb4c6b15c6b5b7974f4cb5cc34af04d8d1
Treehugger Robot [Wed, 19 Jul 2017 14:13:36 +0000 (14:13 +0000)]
Merge "Adding 26 free short codes for DCB and other purposes"
Hugo Benichi [Wed, 19 Jul 2017 12:20:53 +0000 (21:20 +0900)]
CaptivePortalLoginActivity: improve logging
- fix a type in onPageStarted
- map ssl error codes to names in onReceivedSslError
Bug:
62332137
Test: build
Change-Id: Ic789f54e06f539e47b60a67225b04b30cacded55
Neil Fuller [Wed, 19 Jul 2017 09:51:17 +0000 (09:51 +0000)]
Merge "Re-enable some test cases"
am:
8feaad7249
Change-Id: I1b86866748afa6d6014abcbf59116a7abf67b54e
Neil Fuller [Wed, 19 Jul 2017 09:40:52 +0000 (09:40 +0000)]
Merge "Re-enable some test cases"
Hugo Benichi [Wed, 19 Jul 2017 08:04:48 +0000 (08:04 +0000)]
Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone"
am:
24a2adfa27
Change-Id: I4be1d2ce67871c1e01364beca886fdd3af374321
Treehugger Robot [Wed, 19 Jul 2017 07:54:45 +0000 (07:54 +0000)]
Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone"
Hugo Benichi [Wed, 19 Jul 2017 01:10:52 +0000 (10:10 +0900)]
ConnectivityServiceTest: fix testNetworkInfoOfTypeNone
This patch fixes a couple of flakyness issues with
testNetworkInfoOfTypeNone. It also fixes some typos and naming issues.
Bug:
62918393,
62918393
Test: runtest frameworks-net
Change-Id: I1c56557ab113d3ef57dbc06a6e882634d03c5b09
Steven Moreland [Tue, 18 Jul 2017 02:00:43 +0000 (19:00 -0700)]
Reference nativehelper/jni.h as jni.h
nativehelper will no longer export nativehelper/jni.h so that everywhere
can reference this file with the same name.
Bug:
63762847
Change-Id: I3e58d478a2eb17b19db540414545a3c1f9c381af
(cherry picked from commit
98f40c71399e63f2b10cf6e3dffbbcea84d52490)
Hugo Benichi [Wed, 19 Jul 2017 01:06:59 +0000 (01:06 +0000)]
Merge "IpManager: fix test for default ProvisioningConfiguration"
am:
2627d4856b
Change-Id: I087aee995858ae898f5d660c11552724a07503c3
Treehugger Robot [Wed, 19 Jul 2017 00:58:11 +0000 (00:58 +0000)]
Merge "IpManager: fix test for default ProvisioningConfiguration"
Robert Quattlebaum [Tue, 18 Jul 2017 23:33:08 +0000 (23:33 +0000)]
Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN"
am:
777c408a22
Change-Id: I3ae9566ca52b9dae87cace18b1e97897eb8de0ad
Billy Lam [Tue, 18 Jul 2017 23:30:46 +0000 (23:30 +0000)]
Merge "GC in heapDumpFinished to cleanup hprof fd"
am:
f126c41de7
Change-Id: I7025d5810dccb6b2637249063f08c80b1ab7e8d0
Treehugger Robot [Tue, 18 Jul 2017 23:09:58 +0000 (23:09 +0000)]
Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN"
Lorenzo Colitti [Tue, 18 Jul 2017 21:17:33 +0000 (06:17 +0900)]
resolve merge conflicts of
a1d67fb38ec0 to stage-aosp-master
Test: make -j64 services
Change-Id: I3955b01189993f3051c608bc5d07a87e4e3b5f0b
Merged-In: Ic1e799c17b4bb0272cf85e03d5ad14981a55defa
Treehugger Robot [Tue, 18 Jul 2017 22:30:31 +0000 (22:30 +0000)]
Merge "GC in heapDumpFinished to cleanup hprof fd"
Billy Lam [Tue, 18 Jul 2017 19:01:44 +0000 (12:01 -0700)]
GC in heapDumpFinished to cleanup hprof fd
Previously the fd associated with the dump file was
not closed until the next GC. While this did not
affect AMS, external systems relying on monitoring
the close event on the file could not accurately
know when a dump operation was finished.
Bug:
62907010
Test: Manually flashed and tested
Change-Id: I0f6988099f479468f674eb7483f1f14529852270
nharold [Tue, 18 Jul 2017 20:18:10 +0000 (20:18 +0000)]
Merge "Launch NetD in a different thread"
am:
c721dce3fc
Change-Id: I0edeac83cc31b7ff9b264c35e225707ebb8418f2
Tom Cherry [Tue, 18 Jul 2017 20:13:25 +0000 (20:13 +0000)]
Merge "Remove ALOGD_IF_SLOW"
am:
b793aa8c81 -s ours
Change-Id: Id80a4061331c073f7283bd9c0a708e4faf8dc7f7
Neil Fuller [Tue, 18 Jul 2017 20:09:26 +0000 (20:09 +0000)]
Merge "Remove a TODO associate with starting a thread"
am:
c685e1e4a1
Change-Id: I5c9f30ac024a1ccf6fe0e5cba1534dcad4317e25
Steven Moreland [Tue, 18 Jul 2017 20:05:36 +0000 (20:05 +0000)]
Merge "Reference nativehelper/jni.h as jni.h"
am:
899a1f23c5
Change-Id: I30ec4f6b329360ea4161f2ad5538ecd238db7b62
Lorenzo Colitti [Tue, 18 Jul 2017 18:45:29 +0000 (18:45 +0000)]
Merge changes from topic 'tether-offload-cherrypick'
* changes:
Add code to dump OffloadController state.
Fetch tethering offload stats.
Allow more than one source of tethering statistics.
nharold [Tue, 18 Jul 2017 17:56:35 +0000 (17:56 +0000)]
Merge "Launch NetD in a different thread"
Tom Cherry [Tue, 18 Jul 2017 17:20:39 +0000 (17:20 +0000)]
Merge "Remove ALOGD_IF_SLOW"
George Burgess IV [Wed, 21 Jun 2017 06:53:29 +0000 (23:53 -0700)]
Fix static analyzer complaints
frameworks/base/core/jni/android_view_MotionEvent.cpp:383:12: warning:
Potential leak of memory pointed to by 'event'
frameworks/base/core/jni/AndroidRuntime.cpp:975:20: warning: Null passed
to a callee that requires a non-null 1st parameter
For the former, it was surprising to me that the analyzer couldn't
figure out that `event == nativePtr` for the latter check. Filed
https://bugs.llvm.org/show_bug.cgi?id=33540 upstream about it.
For the latter, it was complaining because `className` could be NULL
(more precisely, we have a NULL check at the top of the function it's
declared in, so NULL is presumably a valid value).
Bug: None
Test: Ran mma; complaints are gone.
Change-Id: I26a91ae25934f95acbfdbe4f3641e081fbc66c6d
Lorenzo Colitti [Wed, 12 Jul 2017 16:48:26 +0000 (01:48 +0900)]
Add code to dump OffloadController state.
(cherry-picked from commit
c2519c5feae397e18561e00acea9d5e456bfaabe)
Bug:
29337859
Bug:
32163131
Test: observed output of "adb shell dumpsys connectivity tethering"
Change-Id: Icc5aa605cd64a4a2bb5993941dcc4010cc0b1d8e
Merged-In: Icc5aa605cd64a4a2bb5993941dcc4010cc0b1d8e
Lorenzo Colitti [Wed, 12 Jul 2017 06:48:07 +0000 (15:48 +0900)]
Fetch tethering offload stats.
Make tethering offload register an ITetheringStatsProvider and
fetch tethering stats from the hardware.
Currently we fetch stats in the following cases:
1. Just after changing upstreams, we fetch stats from the
previous upstream.
2. When we are polled by NetworkStatsService.
(cherry-picked from commit
5a7dea1a8eb2cf53fc1d5a52004647de94150e62)
Bug:
29337859
Bug:
32163131
Test: builds, boots
Test: stats appear in tethering logs
Change-Id: If744f2e06cb6a3095a40199936b9afb76eff7b56
Merged-In: If744f2e06cb6a3095a40199936b9afb76eff7b56
Lorenzo Colitti [Mon, 10 Jul 2017 10:06:57 +0000 (19:06 +0900)]
Allow more than one source of tethering statistics.
Currently, netd is the only source of tethering statistics.
In order to support multiple sources, define a new
ITetheringStatsProvider interface that can be registered with
NetworkManagmentService. Convert the existing code into the
first ITetheringStatsProvider.
(cherry picked from commit
ef7b2a13ce4c34950b52de27dcf65b74388d7b3d)
Bug:
29337859
Bug:
32163131
Test: builds, boots
Test: tethering stats continue to be collected
Change-Id: Ie1b5a5e47ae4bf5af922365b09fa241e834236e4
Merged-In: Ie1b5a5e47ae4bf5af922365b09fa241e834236e4
Treehugger Robot [Tue, 18 Jul 2017 15:17:25 +0000 (15:17 +0000)]
Merge "Remove a TODO associate with starting a thread"
Carlos Vinueza [Fri, 7 Jul 2017 19:19:29 +0000 (12:19 -0700)]
Adding 26 free short codes for DCB and other purposes
Whitelist free short code batch 2017 Q2 - Android Partner Engineering
The list includes 2 short codes used for spam reports in GB, 15 for free
carrier services and 9 for for Direct Carrier Billing purposes in
different geos.
Test: manual - uploaded modified file onto test device and tested
sending SMS to changed shortcodes to verify behaviour.
Bug:
37355429
Change-Id: Idb0a1b76619fc635659922083bd19423d96229f1
Signed-off-by: Carlos Vinueza <chinesco@google.com>
Neil Fuller [Tue, 18 Jul 2017 13:02:01 +0000 (14:02 +0100)]
Remove a TODO associate with starting a thread
Switching to an alternative method to run something off
thread.
Bug:
31008728
Test: Internal automated testing / manual tests
Change-Id: Ia33ca29e8d83028a21af1dca22de75dd43eee119
Hugo Benichi [Tue, 18 Jul 2017 07:17:49 +0000 (16:17 +0900)]
IpManager: fix test for default ProvisioningConfiguration
The test did not properly account for the stopAllIP() done in starting
state of the IpManager state machine, which could cause assertions to
fail when stopAllIP() is called again after stop().
Bug:
62988545
Test: runtest frameworks-net
Change-Id: I2c6eb76461a81c1d743bf448da36c58a99ce082d
Fredrik Roubert [Thu, 6 Apr 2017 20:13:51 +0000 (22:13 +0200)]
Update JNI code in preparation for ICU 59 switching to C++11 char16_t.
ICU 59 (update pending on the aosp/icu59 branch) has switched to using
the C++11 char16_t data type, which is a distinct type from uint16_t
(which is what JNI's jchar is typedef'd as), even though they are
bitwise identical.
All code that passes UTF-16 data between ICU4C and JNI must therefore be
updated with typecasts in the appropriate places before ICU 59 is merged
to aosp/master.
Bug:
37554848
Test: make
Change-Id: Ibbc90d2b603382d4715551d05c4a6a462529542d
Merged-In: Ic84a94be82acbef41f80cc113d5da485ce54ae29
Neil Fuller [Tue, 18 Jul 2017 09:30:53 +0000 (10:30 +0100)]
Re-enable some test cases
Re-enable some test cases now the case they test has been
renabled (by commit
3d7a4143d5a2b771a02777354c9a11c981c63c59).
Tested with:
make -j30 FrameworksServicesTests
adb install -r -g \
"out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w \
com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Bug:
31008728
Test: See above
Change-Id: Ia26c4355e41d5b1010594a06bb8c4e8cef8528f7