OSDN Git Service
Hall Liu [Thu, 17 Aug 2017 00:46:24 +0000 (00:46 +0000)]
Revert "Fix lint errors in the streaming API"
This reverts commit
e1f10cbd7ff6128171b6ab37b3afbfdc3d9f9f33.
Change-Id: Id3666b27b0d07b0a1d4f3179f2073aa75440f2ee
Hall Liu [Fri, 4 Aug 2017 01:26:39 +0000 (18:26 -0700)]
Fix lint errors in the streaming API
Fix the errors that cropped up when trying to upload the unhide CL in
MR1.
Bug:
30981736
Test: manual, with testapps
Change-Id: I94e1bcccea4b9f50dae4c93f247ab78058d15bb5
Treehugger Robot [Wed, 2 Aug 2017 17:10:11 +0000 (17:10 +0000)]
Merge "Add owners for the network security config"
Treehugger Robot [Wed, 2 Aug 2017 16:46:42 +0000 (16:46 +0000)]
Merge "Add hwbinder library"
Treehugger Robot [Wed, 2 Aug 2017 16:29:23 +0000 (16:29 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise"
Jonathan Basseri [Wed, 2 Aug 2017 01:44:09 +0000 (01:44 +0000)]
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM.""
Jonathan Basseri [Wed, 2 Aug 2017 01:10:47 +0000 (01:10 +0000)]
Revert "Move getNetworkCountryIso impl from TM to PIM."
This reverts commit
6f4657363cac93ddcc718d9716e3b138f770f2e2.
Change-Id: Ie0062369198af03441c531cd2181ed9c12b8f012
Stan Iliev [Wed, 27 Jul 2016 22:08:06 +0000 (18:08 -0400)]
Delete dead code function SpotShadow::makeClockwise
Delete SpotShadow::makeClockwise, which is unused and does
not link when compiler optimizations are disabled (for debugging).
SpotShadow::makeClockwise calls non-existent function
ShadowTessellator::isClockwise, which only works because the
optimizer deletes the function.
Change-Id: Ib8a014bf168782772faa1da7d75a079c1fd28ed9
(cherry picked from commit
fdb625a309755fb762c448dd8c2c4e3a7cc26021)
Chad Brubaker [Tue, 1 Aug 2017 20:03:06 +0000 (13:03 -0700)]
Add owners for the network security config
Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: I9bb8f5ceaae4a1af8c93f5416a6a5cea42915c62
Jonathan Basseri [Tue, 1 Aug 2017 22:25:28 +0000 (22:25 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM."
Jonathan Basseri [Wed, 19 Jul 2017 20:44:31 +0000 (13:44 -0700)]
Move getNetworkCountryIso impl from TM to PIM.
This moves the implementation of getNetworkCountryIso from
TelephonyManager into PhoneInterfaceManager so that we can perform an
additional IWLAN check.
Bug:
63050313
Test: no compilation errors
Change-Id: I8463af8ed427b73b57a4076c0ff79f055c697657
Ruchi Kandoi [Tue, 1 Aug 2017 20:30:50 +0000 (20:30 +0000)]
Merge "Set default value for T3T_PMM."
Love Khanna [Tue, 1 Aug 2017 13:02:59 +0000 (18:32 +0530)]
Set default value for T3T_PMM.
If HCEF Application does not provide the T3T PMM value, set the
default value (
FFFFFFFFFFFFFFFF) as per NCI specification.
Bug:
64112415
Test: CTS Verifier; HCE-F Reader/Emulator Test
Change-Id: I24f212d9bebd978342e4dd04d618572132e7eb4b
Sundong Ahn [Thu, 13 Jul 2017 07:34:01 +0000 (16:34 +0900)]
Add hwbinder library
HAL impls will depend hwbinder.jar instead of framework.jar on
build-time, but on runtime framework.jar will be used.
This is to cut the circular dependency when using configstore from
Android framework. Also added JNI call to HwBinder.java to cut
configstore's dependency on systemproperty in framework.jar.
Note that hwbinder.jar is LOCAL_UNINSTALLABLE_MODULE and so it won't be
installed in an actual image.
Bug:
35771640
Test: build & run
Change-Id: I2420298cf9df5d6bbcead3e4451b703ce9bc3e29
Neil Fuller [Mon, 31 Jul 2017 12:51:05 +0000 (12:51 +0000)]
Merge "Remove redundant TODOs from PackageTracker"
Treehugger Robot [Mon, 31 Jul 2017 01:38:29 +0000 (01:38 +0000)]
Merge "Logging improvements when NetworkCapabilities change"
Hugo Benichi [Tue, 25 Jul 2017 02:40:56 +0000 (11:40 +0900)]
Logging improvements when NetworkCapabilities change
This patch improves the wtf() logging in updateCapabilities to
better distinguish between the cases of a changed specifiers, changed
transports, or changed capabilities. The case of NOT_METERED being added
or removed is ignored.
Bug:
63326103
Test: runtest frameworks-net, runtest frameworks-wifi
Merged-In: I05c6e78891e1eac658f1cf883223af520a9a4f8f
Merged-In: I4f6cbc0adb461cef6610460daeba72ca38b8f10c
Merged-In: I165a8bbe8362100f1e2bb909459fb45b1c68d5ae
Merged-In: Iec6d92e9a3a12bab87c5adfaf17f776465077060
Merged-In: I633d6347a7f852c27c03fc96b36ca2a60f70c73c
Merged-In: I38739184fc0db105bfd3b4c02cce01e803739e5d
Merged-In: Ia58b877056e2442136cc8b145ac8f4e6560cfc2c
(cherry pick from commit
683ea489d302b494ab40c0d5dc97d352a59d8aa9)
Change-Id: Id32ca66068c8ff549627e8e8c0e50897ef928c58
Neil Fuller [Fri, 28 Jul 2017 16:33:19 +0000 (17:33 +0100)]
Remove redundant TODOs from PackageTracker
The permission checks are either not required (for the data app)
or have been moved to validateUpdaterAppManifest()
(for the updater app).
Bug:
64142062
Test: make droid
Change-Id: Ie1791d64484f53ea2c2476f866fbd75358960de3
Treehugger Robot [Fri, 28 Jul 2017 02:31:52 +0000 (02:31 +0000)]
Merge "Un-hide the MBMS streaming APIs"
Hall Liu [Tue, 18 Jul 2017 18:30:27 +0000 (11:30 -0700)]
Un-hide the MBMS streaming APIs
Unhides the MBMS streaming APIs and modifies the vendor base classes to
no longer pass raw AIDLs to the vendor code.
Test: builds
Change-Id: I56030d646c2a1160277d85779c6ed431cda4efa7
Treehugger Robot [Thu, 27 Jul 2017 17:00:13 +0000 (17:00 +0000)]
Merge "ActivityManagerService: fix nativehelper includes"
Neil Fuller [Thu, 27 Jul 2017 16:48:58 +0000 (16:48 +0000)]
Merge "Tidy up RulesManagerService code"
Steven Moreland [Wed, 26 Jul 2017 19:21:58 +0000 (12:21 -0700)]
ActivityManagerService: fix nativehelper includes
Bug:
63762847
Test: none
Merged-In: I9f9497990fbf0697d05445f563ad46a28d6d6eeb
Change-Id: I964c88cb74f0287dfc6634fbfcd3210a7d984213
Treehugger Robot [Thu, 27 Jul 2017 14:36:47 +0000 (14:36 +0000)]
Merge "NetworkNotificationManager: correctly handle existing notifications"
Treehugger Robot [Thu, 27 Jul 2017 13:25:49 +0000 (13:25 +0000)]
Merge "Alter condition for starting RulesManagerService"
Treehugger Robot [Thu, 27 Jul 2017 13:01:05 +0000 (13:01 +0000)]
Merge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""
Hugo Benichi [Tue, 25 Jul 2017 12:57:51 +0000 (21:57 +0900)]
NetworkNotificationManager: correctly handle existing notifications
This patch corrects a regression added by commit
fb2609d3eee1 that did
not take into account the case of multiple notifications shown for a
single network id. Given how network notifications are triggered, it can
happen that NO_INTERNET and SIGN_IN notifications are both triggered for
the same network when captive portal detection is slow.
Contrary to the situation before commit
fb2609d3eee1, a notification
priority order is introduced so that SIGN_IN always overrides
NO_INTERNET, and NO_INTERNET is ignored if SIGN_IN is already present.
Bug:
63676954
Bug:
62503737
Test: runtest frameworks-net, added new unit tests
Change-Id: Ib8658601e8d4dc6c41b335ab7dd8caa0cccd9531
Narayan Kamath [Thu, 27 Jul 2017 11:26:10 +0000 (11:26 +0000)]
Merge "Remove CoreTests: HeapTest"
Przemyslaw Szczepaniak [Wed, 26 Jul 2017 12:12:43 +0000 (12:12 +0000)]
Revert "Default 'persist.sys.timezone' property to GMT if not set on init."
Telephony code depends on persist.sys.timezone not being set as a signal
to deduce a timezone from sim card information.
This reverts commit
20e020536ebf999c4acb759960ae6e4bfff6ba67.
Bug:
64056758
Change-Id: I8db204bcffbdb960124b1ae0e02d53b27dd310a4
Neil Fuller [Wed, 26 Jul 2017 12:56:25 +0000 (13:56 +0100)]
Tidy up RulesManagerService code
1) Remove error handling TODO; no obvious issues.
2) Avoid avoid a NullPointerException in dumpsys code when current
state cannot be read.
3) Remove unnecessary public modifier.
Bug:
31008728
Test: make
Change-Id: Iab5fae74b74f54bf9d19410f0f4c9ed94365a162
Lucas Gomez Jimenez [Tue, 25 Jul 2017 13:11:35 +0000 (15:11 +0200)]
Remove CoreTests: HeapTest
It is largely redundant due to other tests in art/ and libcore/
Test: Run CoreTests
Change-Id: I97485c522fed157d650b95225ad6641e4184d7bf
Neil Fuller [Wed, 26 Jul 2017 11:11:58 +0000 (12:11 +0100)]
Alter condition for starting RulesManagerService
Modify the condition used for starting RulesManagerService:
use mOnlyCore rather than disableNonCoreServices. mOnlyCore is
important for the secure lock screen and when mOnlyCore is true
the RulesManagerService cannot perform trust checks. Therefore,
disable the RulesManagerService when mOnlyCore == true.
disableNonCoreServices is apparently not used.
Bug:
64057583
Test: Boot device with time zone updates enabled and with a lock
pattern set.
Merged-In: Idd7cb6e11b1a91dfe7394f6c98f8fa3e0eec9dce
Change-Id: Idd7cb6e11b1a91dfe7394f6c98f8fa3e0eec9dce
Treehugger Robot [Wed, 26 Jul 2017 00:12:51 +0000 (00:12 +0000)]
Merge "Silence a memory leak warning from the static analyzer"
George Burgess IV [Tue, 25 Jul 2017 21:22:07 +0000 (14:22 -0700)]
Silence a memory leak warning from the static analyzer
The analyzer assumes that the given `put` operation may fail. This
shouldn't be the case, so mark it with a LOG_ALWAYS_FATAL_IF. Doing so
silences a warning about potential memory leaks originating from
TessellationCache::getRoundRect.
Bug:
27101951
Test: mma. Warning is gone.
Change-Id: I3adeacd6c2c9c03caecd989e2a1267c51e8ef905
Treehugger Robot [Tue, 25 Jul 2017 16:12:23 +0000 (16:12 +0000)]
Merge "Adding 4 standard short codes required by Android Constellation"
Treehugger Robot [Tue, 25 Jul 2017 14:42:40 +0000 (14:42 +0000)]
Merge "Remove TODO related to WakeLocks"
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
Treehugger Robot [Tue, 25 Jul 2017 02:38:47 +0000 (02:38 +0000)]
Merge "Add dump info to IpSecService"
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 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
Treehugger Robot [Mon, 24 Jul 2017 11:21:21 +0000 (11:21 +0000)]
Merge "CaptivePortalLoginActivity: improve logging"
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:09:34 +0000 (21:09 +0000)]
Merge "Make slight API and doc adjustments"
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
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
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 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:27:16 +0000 (07:27 +0000)]
Merge "Add unit test for IpSecService"
Di Lu [Thu, 20 Jul 2017 05:42:53 +0000 (05:42 +0000)]
Merge "Add unit test for IpSecManager"
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
Treehugger Robot [Thu, 20 Jul 2017 03:34:57 +0000 (03:34 +0000)]
Merge "Add Configuration to APF Policy"
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
Treehugger Robot [Thu, 20 Jul 2017 00:23:48 +0000 (00:23 +0000)]
Merge "Add details to Download progress callback"
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
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
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:40:52 +0000 (09:40 +0000)]
Merge "Re-enable some test cases"
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
Treehugger Robot [Wed, 19 Jul 2017 00:58:11 +0000 (00:58 +0000)]
Merge "IpManager: fix test for default ProvisioningConfiguration"
Treehugger Robot [Tue, 18 Jul 2017 23:09:58 +0000 (23:09 +0000)]
Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN"
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
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
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
Nathan Harold [Mon, 17 Jul 2017 21:01:53 +0000 (14:01 -0700)]
Launch NetD in a different thread
Calling run() launches in the current thread;
we want to call start() to launch in a separate
thread to unblock system initialization.
Bug: none
Test: compilation
Change-Id: Ia85059100add6a44a5e3262500b00ba8ca21e125
Treehugger Robot [Tue, 18 Jul 2017 02:47:33 +0000 (02:47 +0000)]
Merge "Reference nativehelper/jni.h as jni.h"
Treehugger Robot [Mon, 17 Jul 2017 22:24:39 +0000 (22:24 +0000)]
Merge "BootReceiver: check console-ramoops-0"