OSDN Git Service
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 [Fri, 14 Jul 2017 02:32:21 +0000 (02:32 +0000)]
Merge "Clean up streaming API docs and organize errors"
Treehugger Robot [Thu, 13 Jul 2017 20:45:21 +0000 (20:45 +0000)]
Merge "IpManager: define InitialConfiguration"
Hugo Benichi [Fri, 23 Jun 2017 01:07:08 +0000 (10:07 +0900)]
IpManager: define InitialConfiguration
This patch adds a InitialConfiguration class to IpManager for specifying
IP information in IpManager ProvisioningConfiguration at IpManager
startup.
At the moment this InitialConfiguration is not used, but is validated in
startProvsiioning if ProvisioningConfiguration includes one. It will be
integrated into IpManager IP provisioning logic in follow-up patches.
This patch also includes an example of data driven unit tests using a
table of test case. The highlights of this methodology are:
1) easy extensibility for new test case,
2) rich and informative error messages,
Unfortunately Java support for inlined data structure literals is poor
and some companion static methods for data generation are required for
enabling this methodology.
Bug:
62988545
Test: added new test in FrameworksNetTests,
$ runtest frameworks-net
$ runtest frameworks-wifi
Merged-In: I060b02603af7d73a6407df89344bf0c000574af2
(cherry pick of commit
2757fcf3a13b0addc4a168a12c72ac2fc418b012)
Change-Id: I48dbf89232d7758f1b07ed4d76ce93281e5c6b53
Treehugger Robot [Thu, 13 Jul 2017 19:11:39 +0000 (19:11 +0000)]
Merge "Add configureRpcThreadpool to java interface"
Neil Fuller [Thu, 13 Jul 2017 10:50:23 +0000 (10:50 +0000)]
Merge "Re-enable use of isPrivilegedApp()"
Treehugger Robot [Thu, 13 Jul 2017 08:53:05 +0000 (08:53 +0000)]
Merge "Program offload-exempt local prefixes into the HAL"
Erik Kline [Tue, 4 Jul 2017 09:28:11 +0000 (18:28 +0900)]
Program offload-exempt local prefixes into the HAL
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- observed calls to the HAL setLocalPrefixes in tethering log
Bug:
29337859
Bug:
32163131
Merged-In: I3c3bd4ee83ffe86ddbe6a16fbbfa0756bf5064d4
Merged-In: Iaf80e584df458010741401fc1a19e7f6e21923c1
Merged-In: Ifaf23c6179ead9de6ccfcf41e0c203025153167b
(cherry picked from commit
32179ff81511e00aef31e8fda705be3df074ece6)
Change-Id: I65ea833ac6fe7a75ebe546cfa358c4cffdf2de05
Treehugger Robot [Thu, 13 Jul 2017 03:38:46 +0000 (03:38 +0000)]
Merge "Revert "Fix ContentObserver unregister issue""
Fyodor Kupolov [Thu, 13 Jul 2017 01:44:36 +0000 (01:44 +0000)]
Revert "Fix ContentObserver unregister issue"
This reverts commit
2df4e144a913b705c50bde929c75744b251967d9.
It was causing failures in packages/apps/DocumentsUI tests
Bug:
63638102
Bug:
63154326
Change-Id: I51fb54f705f58f159f4fcc30bfed41ababcba950
Timur Iskhakov [Mon, 10 Jul 2017 17:08:38 +0000 (10:08 -0700)]
Add configureRpcThreadpool to java interface
Bug:
36233029
Test: links, compiles, hidl_test_java
Change-Id: I7e2ec88b2098886983b1d93ab100a77db63f3976
Hall Liu [Fri, 7 Jul 2017 20:33:16 +0000 (13:33 -0700)]
Clean up streaming API docs and organize errors
* Implement listPendingDownloads and resetDownloadKnowledge
* Bring MbmsStreamingManager docs in line with vendor-side API docs.
* Remove activeStreamingServicesUpdated
* Reorganize the errors in MbmsException into categories.
* Add some vendor API docs for file-download
Change-Id: Ia29066ea6f2c0414171cffa1ae11bb467f187bee
Hall Liu [Wed, 12 Jul 2017 23:18:37 +0000 (23:18 +0000)]
Merge "Implement getDownloadStatus and add permission"
Treehugger Robot [Wed, 12 Jul 2017 17:39:56 +0000 (17:39 +0000)]
Merge "Avoid exposing OffloadCallbackEvent values"
Treehugger Robot [Wed, 12 Jul 2017 17:35:15 +0000 (17:35 +0000)]
Merge "Stop unnecessary tethering reconfigurations"
Neil Fuller [Wed, 12 Jul 2017 16:18:19 +0000 (17:18 +0100)]
Re-enable use of isPrivilegedApp()
Re-enable use of isPrivilegedApp() since it appears to work.
Bug:
35995024
Bug:
31008728
Test: Manual testing
Change-Id: If5a59aeba19320d55b42ff3dd28a654bce27dd35
Erik Kline [Tue, 11 Jul 2017 15:15:26 +0000 (00:15 +0900)]
Avoid exposing OffloadCallbackEvent values
Keep the android.hardware.tetheroffload.control.V1_0.OffloadCallbackEvent
import from leaking outside of OffloadHardwareInterface by converting each
event type into a separate callback.
Add basic logging implementation in OffloadController. Seems like every
call just needs to log save for two that actually need to do work:
- onSupportAvailable()
* poll stats and notify NetworkStatsService
* (re)push all state, as the hardware now supports offload (again)
- onStoppedLimitReached()
* poll stats and notify NetworkStatsService
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passed
Bug:
29337859
Bug:
32163131
Merged-In: I7c7675922a561a4642120df51715a550dab7f503
Merged-In: Ie91b974fbf70a4242f8b220d5fa3d6a0de59201d
Merged-In: I46c2e5252ae72a09a1550862847c1af441ece072
(cherry picked from commit
a0885000f227ebf15f0b78d1d28c7a5de4afa8ea)
Change-Id: I1981d8da79f24dd0b4d76b930a5f179682500294
Treehugger Robot [Wed, 12 Jul 2017 15:37:40 +0000 (15:37 +0000)]
Merge "Address further API review comments"
Treehugger Robot [Wed, 12 Jul 2017 15:36:18 +0000 (15:36 +0000)]
Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper"
Erik Kline [Sat, 8 Jul 2017 11:36:37 +0000 (20:36 +0900)]
Stop unnecessary tethering reconfigurations
The TetheringConfiguraiton is retrieved at startup and on every
ACTION_CONFIGURATION_CHANGED broadcast. Re-retrieving the config
at every upstream selection is unnecessary and fills up the logs.
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
32163131
Bug:
63250751
Merged-In: Id089375a5699ac1157fc5f445876fee558d7bc7e
Merged-In: I1fc87f9c2a31f7fd16889275e6ba197b2b48a264
Merged-In: Ia6276ada690aa3e4870bb83dc4bf3ddcddc35e7b
(cherry picked from commit
6ee73daa0aa90620e4b2cb13ead4b53d16f45010)
Change-Id: Ic51123e173cc29cfcb52210707f2a0f8d2ab2e3b
Erik Kline [Wed, 12 Jul 2017 06:46:54 +0000 (15:46 +0900)]
Add OffloadHardwareInterface.getForwardedStats() wrapper
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
29337859
Bug:
32163131
Merged-In: I41f837e16eff9a4cd763d65155bd9b5d5d980acd
Merged-In: Id9766983a3bbd885ef0f0d3ba9e33de903939f2d
Merged-In: Id831bc99cadbd59d280b026866707dbbe3b0e542
(cherry picked from commit
9a5b02a89c02d5ff633d8456b22d3d5b7a15bd44)
Change-Id: I0752b6e2cf1e0b9a5075f7911408528538683c84
Treehugger Robot [Wed, 12 Jul 2017 06:06:07 +0000 (06:06 +0000)]
Merge "Restructure use of absent tether_offload_disabled setting"
Treehugger Robot [Wed, 12 Jul 2017 04:35:34 +0000 (04:35 +0000)]
Merge "Connectivity: Fix format arguments"
Erik Kline [Fri, 7 Jul 2017 08:38:30 +0000 (17:38 +0900)]
Restructure use of absent tether_offload_disabled setting
This restructures the fetching of the default disposition such
that we disable (and enable) the feature with only a single
character change.
Additionally: fix unittests with proper use of FakeSettingsProvider.
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passed with developer enabled and disabled
Bug:
29337859
Bug:
32163131
Bug:
63250751
(cherry picked from commit
c87cd411843484225897ebdf91cd05073c1c5f35)
Merged-In: Ib32489d07778465134bca52c589baddbd78ab129
Merged-In: I03d68b0da192fbd6172639343d4ab88c20127ad7
Merged-In: I10c0af2b2c4f6b6e613380e637cc3acb1f7a55a3
Change-Id: Ie16a022be8dacd76b0402bcb777680c36163a084
Di Lu [Wed, 12 Jul 2017 03:53:57 +0000 (03:53 +0000)]
Merge "Remove return value of ipSecAddSecurityAssociation"
Treehugger Robot [Wed, 12 Jul 2017 03:41:57 +0000 (03:41 +0000)]
Merge "Add first OWNERS files for core networking"
Treehugger Robot [Wed, 12 Jul 2017 02:43:14 +0000 (02:43 +0000)]
Merge "app_main: silence static analyzer warnings"
Andreas Gampe [Tue, 11 Jul 2017 22:14:41 +0000 (15:14 -0700)]
Connectivity: Fix format arguments
Fix missing argument.
Bug:
19797138
Test: m
Change-Id: I5fdd2a453c0d7422e8c3e79c8dce2d0800ec45e9
Treehugger Robot [Wed, 12 Jul 2017 01:17:19 +0000 (01:17 +0000)]
Merge "IpSecService: Actually throw exception"
George Burgess IV [Wed, 12 Jul 2017 00:18:26 +0000 (17:18 -0700)]
app_main: silence static analyzer warnings
This silences two warnings:
frameworks/base/cmds/app_process/app_main.cpp:238:11: warning: Potential
memory leak
frameworks/base/cmds/app_process/app_main.cpp:261:9: warning: Potential
memory leak
As the (existing) comment notes, we nuke argv later in main(), so these
copies are necessary. Since these args need to live for basically the
entire life of the process, it seems pointless to go out of our way to
free them.
Bug:
27101951
Test: mma. Static analyzer warnings are gone.
Change-Id: Icbfabfede9db909f6acb274b697cb6076c3fc11f
Hugo Benichi [Fri, 7 Jul 2017 02:55:41 +0000 (11:55 +0900)]
Add first OWNERS files for core networking
Covering
core/java/android/net/
core/java/com/android/server/net/
packages/CaptivePortalLogin/
services/core/java/com/android/server/
ConnectivityService.java
NsdServic.java
NetworkManagementService.java
services/core/java/com/android/server/connectivity/
services/net/
tests/net/
Android core networking files not covered:
services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp
services/core/proto/ipconnectivity.proto (path unique to aosp)
Bug:
63408147
Test: builds
Change-Id: Ifbb923d5ffdcada83864b5e0eb07911682d66efa
Andreas Gampe [Tue, 11 Jul 2017 17:25:09 +0000 (10:25 -0700)]
IpSecService: Actually throw exception
Add a missing throw.
Bug:
19797138
Test: m
Test: Device boots
Change-Id: I6c6058ecc95a5b85da43a42bac2846c31cefc038
Treehugger Robot [Tue, 11 Jul 2017 20:15:17 +0000 (20:15 +0000)]
Merge "GATT: Expose opportunistic client API to Java"
Jack He [Wed, 5 Jul 2017 21:55:35 +0000 (14:55 -0700)]
GATT: Expose opportunistic client API to Java
* Allow Java based programs to create an opportunistic GATT client
* Such client does not hold a GATT connection. It automatically
disconnects when no other GATT connections are active for the
remote device.
Bug:
63347806
Test: make, run battery service
Change-Id: Ib9333817d7f17a1fa3ddacfa51c680890bac19ec
Neil Fuller [Tue, 11 Jul 2017 14:25:48 +0000 (15:25 +0100)]
Address further API review comments
Address further API review comments from API reviewer.
Bug:
31008728
Test: make droid
Change-Id: I0b3f6be9eaf69ffa8a6e73475f9c3a9ba3e343f2
Treehugger Robot [Tue, 11 Jul 2017 10:58:30 +0000 (10:58 +0000)]
Merge "Fix typo in Parcel javadoc."
Neil Fuller [Tue, 11 Jul 2017 10:01:01 +0000 (10:01 +0000)]
Merge "Move column definitions to an inner class"
Hugo Benichi [Tue, 11 Jul 2017 07:05:26 +0000 (07:05 +0000)]
Merge "Fix for the missing focus in WebView form fields."
susnata [Fri, 23 Jun 2017 16:13:05 +0000 (09:13 -0700)]
Fix for the missing focus in WebView form fields.
This looks like a regression for WebView (58.0.3029.125) in android
'O'. But this seems to have been fixed in early version of 60 (webview).
This workaround gets us past the problem, until we get the newer version
of WebView.
Bug:
62449959
Test: Manual
Change-Id: Iab22f8f0db0ab58cb0a184c3f88e6b3770a35fb0
Merged-In: I29883bf7d1567c1ce7be90b4efde4b3da93b99a2
(cherry pick from commit
97640400c4aa6bf05d5606ea749b54ad63de97cd)
Bin Chen [Tue, 11 Jul 2017 03:01:44 +0000 (11:01 +0800)]
Fix typo in Parcel javadoc.
Change-Id: Ida05259143e86c15c2ed69eeb7566d39b60fa823
Neil Fuller [Mon, 10 Jul 2017 18:18:01 +0000 (19:18 +0100)]
Move column definitions to an inner class
Move column definitions and other URI constants
to inner classes based on feedback from an API council
reviewer.
Bug:
31008728
Test: make droid
Change-Id: I213e44f2655017e0ca32a4dfb1f5617ef471d854
Neil Fuller [Mon, 10 Jul 2017 14:14:46 +0000 (14:14 +0000)]
Merge "Configure the package name of the updater app"
Treehugger Robot [Mon, 10 Jul 2017 12:15:47 +0000 (12:15 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error."
Treehugger Robot [Mon, 10 Jul 2017 12:00:31 +0000 (12:00 +0000)]
Przemyslaw Szczepaniak [Tue, 4 Jul 2017 09:32:11 +0000 (10:32 +0100)]
Track libcore commit
2fd032687ba3d4d7f6af560482c5aba525584621
Test: Make
Bug:
62779247
Change-Id: I919df93b20e809f42a27225403e1549b763b0a60
Treehugger Robot [Mon, 10 Jul 2017 11:52:11 +0000 (11:52 +0000)]
Merge "Fix dumpsys output for staged install version"
Hugo Benichi [Mon, 10 Jul 2017 11:42:45 +0000 (11:42 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors."
Lorenzo Colitti [Mon, 10 Jul 2017 10:05:13 +0000 (19:05 +0900)]
Make failure to set addrgenmode a non-fatal error.
Bug:
17613910
Test: bullhead builds, boots, connects to wifi
Change-Id: I310dcacc6784c13904fca79b839b5f4d94bfc45e
Hugo Benichi [Sat, 17 Jun 2017 04:36:35 +0000 (13:36 +0900)]
CaptivePortalLogin ignores some ssl errors.
This patch changes the ssl error handler of the captive portal login
activity to ignore errors for resources coming from a different hostname
that the top-level page currently loading.
This allows logging into misconfigured portals that incorrectly bans ssl
to some hostnames necessary for loading their portal login pages.
Bug:
62332137
Test: manually tested with captive portal entwork.
Change-Id: I05378ed74e678829e46fbeee18df916ec6ec2856
Treehugger Robot [Sat, 8 Jul 2017 07:06:09 +0000 (07:06 +0000)]
Merge "Add more logging to the Tethering SharedLog"
Treehugger Robot [Fri, 7 Jul 2017 21:20:40 +0000 (21:20 +0000)]
Merge "Fix wrong array index bound in NotificationUsageStats"
Neil Fuller [Fri, 7 Jul 2017 15:09:49 +0000 (16:09 +0100)]
Fix dumpsys output for staged install version
Fix dumpsys output for staged install version:
there was a double prefix.
Bug:
31008728
Test: Manual
Change-Id: Idcbdee68cb9961d93df6de96d7a1617f70b7ac94
Erik Kline [Thu, 6 Jul 2017 07:40:06 +0000 (16:40 +0900)]
Add more logging to the Tethering SharedLog
This may at first seem a tad spammy, but a cursory examination suggests
most of this is the Tethering subsystem doing more work than necessary.
Some of this can be addressed with some simple changes in the near term.
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- watch "adb shell dumpsys connectivity tethering | tail 60"
shows new log entries
Bug:
29337859
Bug:
32163131
Bug:
63334101
Change-Id: I9539a37f346469f0474084f5f31527bc35093bce
Merged-In: I6820e6cc81cfa43d99ad66860e1dcf42d20109f8
Merged-In: I10960bf23a837eda1fb473826596c484484f1875
Merged-In: I0a8eb8be5562fa814109191b0110050ca4b60c02
Merged-In: I6219e56d571854a2c61e1da63095e319e4bd3dc1
Adam Vartanian [Fri, 7 Jul 2017 07:27:29 +0000 (07:27 +0000)]
Merge "Streamline testInstall_compatibleContext()"
Ruchi Kandoi [Thu, 6 Jul 2017 22:41:29 +0000 (22:41 +0000)]
Merge changes from topic 'NCI-2.0'
* changes:
AID suffix registration.
NCI2.0 update LF_T3T_PARAMETERS of 18 byte.
Alex Light [Thu, 6 Jul 2017 21:03:24 +0000 (21:03 +0000)]
Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor"
Colin Cross [Thu, 6 Jul 2017 20:48:31 +0000 (20:48 +0000)]
Merge "Enable priority boost for non-Jack builds."
Hall Liu [Fri, 30 Jun 2017 01:37:11 +0000 (18:37 -0700)]
Implement getDownloadStatus and add permission
- Implement getDownloadStatus in the manager
- Remove DownloadStatus and add constants in its place to reflect the
status of a single file
- Add ACT_AS_EMBMS_MIDDLEWARE permission
Change-Id: Ica8b8a872a8088a2aaf56d40926051225aa39e87
Yifan Hong [Thu, 6 Jul 2017 19:48:26 +0000 (19:48 +0000)]
Merge "Log errors on android.os.VintfObject.verify()"
Alan Leung [Wed, 14 Jun 2017 20:50:45 +0000 (13:50 -0700)]
Enable priority boost for non-Jack builds.
Test: m ANDROID_COMPILE_WITH_JACK=false / checked for boost+reset calls.
BUG:
36791701
Change-Id: I5fb4107ae39e76644c01c502483ae7d887ab18a3
Merged-In: I5fb4107ae39e76644c01c502483ae7d887ab18a3
(cherry picked from commit
421baeb9289cd5a16e2fef5601dcddbbfad8eb3e)
Alex Light [Thu, 6 Jul 2017 18:25:18 +0000 (11:25 -0700)]
Unhide InMemoryDexClassLoader ByteBuffer[] constructor
This constructor lets one give multiple dex files as byte buffers for
the InMemoryDexClassLoader.
Bug:
63390204
Test: Builds
Change-Id: I5b8a7860dbc365c0a51dbaf4540b9fa53c922546
Hall Liu [Thu, 6 Jul 2017 18:08:02 +0000 (18:08 +0000)]
Merge "Add a reason arg to streamStateUpdated"
Fyodor Kupolov [Thu, 6 Jul 2017 18:07:04 +0000 (18:07 +0000)]
Merge "Fix ContentObserver unregister issue"
Love Khanna [Fri, 12 May 2017 08:23:42 +0000 (13:53 +0530)]
AID suffix registration.
Test: compiles.
Change-Id: I0ab02599814722055d77eef29e734bfd45e8d1ee
Adam Vartanian [Thu, 6 Jul 2017 14:43:52 +0000 (15:43 +0100)]
Streamline testInstall_compatibleContext()
Conscrypt is making ClientSessionContext#getSession() private since
users shouldn't be calling it, which causes this test to fail to build.
While this test uses it, in practice the only non-Conscrypt code it's
testing is SSLSessionCache#install(), the rest of it just tests that
Conscrypt works properly. We reduce the test to just a test of the
SSLSessionCache code, since Conscrypt's tests should suffice for testing
Conscrypt's use of the cache.
Test: adb shell am instrument -w -e class android.net.SSLSessionCacheTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Iea61c47eb2c002629dd2f50c81d5bc4f7221c654
Treehugger Robot [Thu, 6 Jul 2017 07:54:33 +0000 (07:54 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()"
Erik Kline [Thu, 6 Jul 2017 03:38:48 +0000 (12:38 +0900)]
Clearly log tether_offload_disabled setting status in start()
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
29337859
Bug:
32163131
Change-Id: I113358ef71c2e5e3254eb6f9fbf9d5721825b0df
Merged-In: Iebcdb7bfaa85f822e73fe2f3b54caceb5420709c
Merged-In: Ifce832dca7b4d8b3056e2a9e91d38bffe25cfeb6
Merged-In: I99f6abc31579b4b25589452c44e1834a7ba4e591
Merged-In: I312a9309d6934bcec7fc0245cad12b97f1a22521
Mathieu Chartier [Thu, 6 Jul 2017 03:13:52 +0000 (03:13 +0000)]
Merge "ProcessStats: fix uss average value offset"
daqi [Wed, 28 Jun 2017 06:16:13 +0000 (14:16 +0800)]
Fix ContentObserver unregister issue
[Cause of Defect]
In the ContentObserver callback procedure, the binder thread
has no sync mechanism with handler thread.
The ContentObserver#onChange method can get called after
ContentResolver#unregisterContentObserver called in the
very low probability.
Bug: https://issuetracker.google.com/issues/
63154326
Test: manual - check https://github.com/nanjingdaqi/ContentObserverDemo
Change-Id: I0e3831eba7a9cc1a5bf0d30abe5dd0ec8259b0d4
Signed-off-by: daqi <daqi@xiaomi.com>
Hall Liu [Thu, 6 Jul 2017 01:52:04 +0000 (01:52 +0000)]
Merge "Update DownloadRequest API"
Treehugger Robot [Thu, 6 Jul 2017 01:30:10 +0000 (01:30 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover"
Treehugger Robot [Thu, 6 Jul 2017 00:31:44 +0000 (00:31 +0000)]
Merge "Better logging infrastructure in OffloadHardwareInterface"
Hiroki Yamamoto [Fri, 14 Apr 2017 06:10:15 +0000 (15:10 +0900)]
Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover
Test: do Nfc Bluetooth Handover and wait for the timeout
Bug:
63250718
Change-Id: Ieea8b8f7a07fe90a594ed13ecfefd01e1d60853d
Yifan Hong [Wed, 5 Jul 2017 23:39:51 +0000 (16:39 -0700)]
Log errors on android.os.VintfObject.verify()
Test: pass
Bug:
63290683
Change-Id: I7ddc355024359e31aca4bbdf18f42075f72ddd5a
Tobias Thierer [Wed, 5 Jul 2017 22:22:16 +0000 (22:22 +0000)]
Merge "Track update of org.json API"
Treehugger Robot [Wed, 5 Jul 2017 22:20:40 +0000 (22:20 +0000)]
Merge "Framework: Add libziparchive dependency"
Treehugger Robot [Wed, 5 Jul 2017 21:01:29 +0000 (21:01 +0000)]
Andreas Gampe [Mon, 3 Jul 2017 20:03:29 +0000 (13:03 -0700)]
Framework: Add libziparchive dependency
Bug:
37342627
Test: m
Change-Id: I4bc85b87a6c4305f14586aba662bcccbd4b8b6e2
Adam Lesinski [Fri, 28 Oct 2016 23:39:15 +0000 (16:39 -0700)]
Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6
Partial cherry-pick of commit
7ad1110ecd6a840fcd2895c62668828a1ca029c6.
Test: m
Merged-In: Id0e57ee828f17008891fe3741935a9be8830b01d
Change-Id: Id0e57ee828f17008891fe3741935a9be8830b01d
Erik Kline [Tue, 4 Jul 2017 04:39:48 +0000 (13:39 +0900)]
Better logging infrastructure in OffloadHardwareInterface
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- watch "adb shell dumpsys connectivity tethering | tail -60" shows logs
Bug:
29337859
Bug:
32163131
Merged-In: I3b178f4bb798d9ac59b366723d19e3189d39942e
Merged-In: I1b64e562c74797cbfaa26f3a1b5e38c3bf2a0c0d
Merged-In: Id0bd14e5b364c497403c2d88f7b1c31d712e6f87
Change-Id: I78f28a9e940cc7e050f2d79f877d27468d13599a
Treehugger Robot [Wed, 5 Jul 2017 14:21:35 +0000 (14:21 +0000)]
Merge "ConnectivityManager: allow usage of TYPE_NONE"
Treehugger Robot [Wed, 5 Jul 2017 14:07:37 +0000 (14:07 +0000)]
Merge "ConnectivityServiceTest: more informative assert failures"
Hugo Benichi [Tue, 20 Jun 2017 05:07:59 +0000 (14:07 +0900)]
ConnectivityManager: allow usage of TYPE_NONE
This patch allows to use TYPE_NONE for the legacy network type variable
of NetworkInfo. This usage is "safe" with respect to legacy APIs using
network types as most of them already returns null or do nothing for
TYPE_NONE.
Of the existing APIs in ConnectivityManager that accept a network type
argument, those which were already returning null or doing nothing for
TYPE_NONE are:
getNetworkInfo(int)
getNetworkForType(int)
stopUsingNetworkFeature(int, String)
networkCapabilitiesForType(int)
requestRouteToHostAddress(int, InetAddress)
reportInetCondition(int, int)
isNetworkSupported(int)
getLinkProperties(int)
Only setProvisioningNotificationVisible needs an additional guard
against TYPE_NONE.
Bug:
30088447
Bug:
62844794
Test: runtest frameworks-net
Change-Id: I112596fcd03d3c2cd42a2a84d265adb38e3944bb
Hugo Benichi [Mon, 26 Jun 2017 01:06:49 +0000 (10:06 +0900)]
ConnectivityServiceTest: more informative assert failures
Bug:
62918393
Test: runtest frameworks-net
Change-Id: If87315ef7cba6380596f48b92c7e0f6eeccc8368
Hugo Benichi [Wed, 5 Jul 2017 12:25:16 +0000 (12:25 +0000)]
Merge "ConnectivityServiceTest: eliminate remaining sleep()"
Hugo Benichi [Mon, 26 Jun 2017 01:20:00 +0000 (10:20 +0900)]
ConnectivityServiceTest: eliminate remaining sleep()
ConnectivityServiceTest was still using sleep() in a few places although
these were unnecessary:
- in testSatisfiedThenLostNetworkRequestDoesNotTriggerOnAvailable(),
expectNoCallback() and expectAvailableCallback() already include
waitForIdleHandler calls that drain the message queues and make
sleep no-ops.
- in testTimedoutAfterUnregisterdNetworkRequest, the sleeps were
introduced before unregisterNetworkCallback was changed to have a
synchronous effect for callback unregistration, therefore the sleep
becomes simply non-sensical. To reflect this the name of the method
is also changed.
Bug:
62918393
Test: runtest frameworks-net
Change-Id: I7b701ecf5846a5e1890e86107b8d2544b419ce44
Treehugger Robot [Wed, 5 Jul 2017 05:56:29 +0000 (05:56 +0000)]
Merge "Switch to USB_CONFIGURED as the primary USB readiness signal"
Erik Kline [Tue, 4 Jul 2017 13:02:49 +0000 (22:02 +0900)]
Switch to USB_CONFIGURED as the primary USB readiness signal
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- USB tethering on and off works as expected
Bug:
32163131
Bug:
36216864
Bug:
62147658
Bug:
62552150
Merged-In: I3ae731c21f292a476a9e30e229d66ef6ab4a0545
Merged-In: I717fdd269b012f32548ebe0603999ae403b03100
Merged-Id: Ia8f7f3616f1358b0427386ce8aff26899e03ac07
Change-Id: Ia8f7f3616f1358b0427386ce8aff26899e03ac07
(cherry picked from commit
c438e306cc69b9d4d62512030267e93011b29978)
Roland Levillain [Tue, 4 Jul 2017 11:15:18 +0000 (11:15 +0000)]
Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE""
Roland Levillain [Tue, 4 Jul 2017 11:07:47 +0000 (11:07 +0000)]
Revert "ConnectivityManager: allow usage of TYPE_NONE"
This CL is breaking some internal builds.
This reverts commit
726931ebf4707795413578b57a1f033bf9a6e064.
Change-Id: Ie79214808d84c73f54a525f515b4c90a3fb23542
Roland Levillain [Tue, 4 Jul 2017 11:12:10 +0000 (11:12 +0000)]
Merge "Revert "ConnectivityServiceTest: more informative assert failures""
Roland Levillain [Tue, 4 Jul 2017 11:09:10 +0000 (11:09 +0000)]
Revert "ConnectivityServiceTest: more informative assert failures"
CL https://android-review.googlesource.com/#/c/420720/ is
breaking several internal builds, and CL
https://android-review.googlesource.com/#/c/422480/ must
be reverted beforehand.
This reverts commit
a6981669c4e2707bcfb3db001e262b2da4bb9c17.
Change-Id: I5883409452d39e1834e183aa7b5ccdbf14291ca5
Roland Levillain [Tue, 4 Jul 2017 11:11:09 +0000 (11:11 +0000)]
Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()""
Roland Levillain [Tue, 4 Jul 2017 11:10:06 +0000 (11:10 +0000)]
Revert "ConnectivityServiceTest: eliminate remaining sleep()"
CL https://android-review.googlesource.com/#/c/420720/ is
breaking several internal builds, and CL
https://android-review.googlesource.com/#/c/422481/ must
be reverted beforehand.
This reverts commit
8afb9cfd000dadc730e52ebdeb4ad031b84b8e03.
Change-Id: If0b196b6860c4087a05b28770469d7850a76fd37
Treehugger Robot [Tue, 4 Jul 2017 09:25:53 +0000 (09:25 +0000)]
Merge "ConnectivityServiceTest: eliminate remaining sleep()"
Treehugger Robot [Tue, 4 Jul 2017 09:22:07 +0000 (09:22 +0000)]
Merge changes I90c211dc,I4455f272
* changes:
ConnectivityServiceTest: more informative assert failures
ConnectivityManager: allow usage of TYPE_NONE
Hugo Benichi [Mon, 26 Jun 2017 01:20:00 +0000 (10:20 +0900)]
ConnectivityServiceTest: eliminate remaining sleep()
ConnectivityServiceTest was still using sleep() in a few places although
these were unnecessary:
- in testSatisfiedThenLostNetworkRequestDoesNotTriggerOnAvailable(),
expectNoCallback() and expectAvailableCallback() already include
waitForIdleHandler calls that drain the message queues and make
sleep no-ops.
- in testTimedoutAfterUnregisterdNetworkRequest, the sleeps were
introduced before unregisterNetworkCallback was changed to have a
synchronous effect for callback unregistration, therefore the sleep
becomes simply non-sensical. To reflect this the name of the method
is also changed.
Bug:
62918393
Test: runtest frameworks-net
Change-Id: I78426665670f702304212753f417b3d5a8a2c107
Hugo Benichi [Mon, 26 Jun 2017 01:06:49 +0000 (10:06 +0900)]
ConnectivityServiceTest: more informative assert failures
Bug:
62918393
Test: runtest frameworks-net
Change-Id: I90c211dc6d6262475924ecabc2863c47aec5a0b9