OSDN Git Service
Stanley Tng [Thu, 12 Apr 2018 15:50:35 +0000 (08:50 -0700)]
Merge "Add min_ce/max_ce parameters to requestLeConnectionUpdate()"
am:
0980006a2a
Change-Id: I3aec5bce2861518d79ae80dd32562d83bc0c7ef4
Stanley Tng [Thu, 12 Apr 2018 14:36:12 +0000 (14:36 +0000)]
Merge "Add min_ce/max_ce parameters to requestLeConnectionUpdate()"
Chen Xu [Thu, 12 Apr 2018 05:33:12 +0000 (22:33 -0700)]
Merge "Change getGroupIdLevel1() to use subId from TelephonyManager Instance"
am:
18fe1cb2e1
Change-Id: Ia69e1183fbc9b115c0514c33afe0d235eafd9c32
Chen Xu [Thu, 12 Apr 2018 04:30:18 +0000 (04:30 +0000)]
Merge "Change getGroupIdLevel1() to use subId from TelephonyManager Instance"
fionaxu [Wed, 11 Apr 2018 19:47:46 +0000 (12:47 -0700)]
Change getGroupIdLevel1() to use subId from TelephonyManager Instance
Bug:
77905912
Test: Build
Change-Id: I720971ce115147b994e27611a0dcf052989180ec
(cherry picked from commit
272e8cf87e3aa780d7b83c021b859fdfc396f9d8)
Merged-in:
272e8cf87e3aa780d7b83c021b859fdfc396f9d8
Erik Kline [Wed, 11 Apr 2018 22:57:24 +0000 (15:57 -0700)]
Merge "Don't unnecessarily reevaluate tethering provisioning"
am:
f0e598b550
Change-Id: Iba76e0fea962ca738160f6cbbaa31b66465bdfcc
Treehugger Robot [Wed, 11 Apr 2018 21:47:53 +0000 (21:47 +0000)]
Merge "Don't unnecessarily reevaluate tethering provisioning"
Erik Kline [Wed, 28 Feb 2018 06:01:35 +0000 (15:01 +0900)]
Don't unnecessarily reevaluate tethering provisioning
Registering for carrier config changes can deliver a sticky broadcast
and can cause Tethering to think something has changed and reevaluate
provisioning status, even though this has been checked before it
entered tethering mode alive state.
Additionally, move the provisioning_app{,no_ui} resources into the
TetheringConfiguration, if for no other reason than now we can log
it in .toString().
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- manual USB tethering toward WiFi works
Bug:
69565814
Merged-In: If254326e892b78ef9daf620f829c1def136d695c
Merged-In: I288093a1d76566e72d4889d92c7aedafc318c8b6
Merged-Id: I01c71fd971a4683bb2b6d14825d36f24a04d88a8
Change-Id: I01c71fd971a4683bb2b6d14825d36f24a04d88a8
(cherry picked from commit
1b450e3eb9106a9cc73dfc144d275141dd5017ef)
Erik Kline [Wed, 28 Feb 2018 06:01:35 +0000 (15:01 +0900)]
Don't unnecessarily reevaluate tethering provisioning
Registering for carrier config changes can deliver a sticky broadcast
and can cause Tethering to think something has changed and reevaluate
provisioning status, even though this has been checked before it
entered tethering mode alive state.
Additionally, move the provisioning_app{,no_ui} resources into the
TetheringConfiguration, if for no other reason than now we can log
it in .toString().
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- manual USB tethering toward WiFi works
Bug:
69565814
Merged-In: If254326e892b78ef9daf620f829c1def136d695c
Merged-In: I288093a1d76566e72d4889d92c7aedafc318c8b6
Change-Id: I01c71fd971a4683bb2b6d14825d36f24a04d88a8
Colin Cross [Tue, 10 Apr 2018 18:24:45 +0000 (11:24 -0700)]
Merge "Add a droiddoc generator for hwbinder.stubs"
am:
1142ffcc9b
Change-Id: Ic4b67c00479fe21f6aa2dd41109d9da5514870ca
Colin Cross [Tue, 10 Apr 2018 17:43:52 +0000 (10:43 -0700)]
Merge changes from topic "hidl-system-api"
am:
88a2b68252
Change-Id: I862274d2d6a258f252370a9ae3843a31c038d684
Steven Moreland [Tue, 10 Apr 2018 17:39:10 +0000 (10:39 -0700)]
Update HIDL-related documentation.
am:
9efa13f38c
Change-Id: I8a053ee95610272f97f0031936ac3d3fe50766d2
Steven Moreland [Tue, 10 Apr 2018 17:34:34 +0000 (10:34 -0700)]
Add remaining missing HIDL SystemApi methods.
am:
ff0a3642e4
Change-Id: Iafa60151da6c8b994911ff077cfcfdf53bc61b81
Steven Moreland [Tue, 10 Apr 2018 17:29:11 +0000 (10:29 -0700)]
HIDL: reportSyspropMethod -> enableInstrumentation
am:
9312938842
Change-Id: Ia533c7ad33066b8c20610f8ea5fea6255d778d1b
Steven Moreland [Tue, 10 Apr 2018 17:22:25 +0000 (10:22 -0700)]
Allow HIDL to be used in priv-apps.
am:
4dde8a113b
Change-Id: Ib255c6b6603cdb51fa1c4c5a11d3c1dc8a0c24a9
Colin Cross [Tue, 10 Apr 2018 17:15:28 +0000 (17:15 +0000)]
Merge "Add a droiddoc generator for hwbinder.stubs"
Colin Cross [Tue, 10 Apr 2018 16:06:28 +0000 (16:06 +0000)]
Merge changes from topic "hidl-system-api"
* changes:
HIDL: add APIs used by subclasses to SystemApi
Update HIDL-related documentation.
Add remaining missing HIDL SystemApi methods.
HIDL: reportSyspropMethod -> enableInstrumentation
Allow HIDL to be used in priv-apps.
Erik Kline [Tue, 10 Apr 2018 11:37:13 +0000 (04:37 -0700)]
[automerger skipped] Merge "Revert "Don't unnecessarily reevaluate tethering provisioning""
am:
abb1562ca1 -s ours
Change-Id: I6dfb0ca5342ad1a0cad6cc02b6f96f83ae897392
Treehugger Robot [Tue, 10 Apr 2018 08:35:31 +0000 (08:35 +0000)]
Merge "Revert "Don't unnecessarily reevaluate tethering provisioning""
Erik Kline [Tue, 10 Apr 2018 07:05:08 +0000 (00:05 -0700)]
[automerger skipped] Merge "Don't unnecessarily reevaluate tethering provisioning"
am:
081014ac55 -s ours
Change-Id: Ia4e02d723ae3d2305433f7f1e55f13d018e0ab89
Erik Kline [Tue, 10 Apr 2018 07:01:16 +0000 (07:01 +0000)]
Revert "Don't unnecessarily reevaluate tethering provisioning"
This reverts commit
8067d78c32f545db6d35c660279ab3f2326ba41d.
Change-Id: I9098f98cb134c35692c1384339f9407b94ce6f28
Erik Kline [Tue, 10 Apr 2018 04:17:46 +0000 (21:17 -0700)]
Merge "Trigger NetworkCallback events when private DNS usage has changed."
am:
ec4ded5222
Change-Id: Ibf97fa6dce68a59f69480f668a34a40cecba2a38
Treehugger Robot [Tue, 10 Apr 2018 03:22:10 +0000 (03:22 +0000)]
Merge "Don't unnecessarily reevaluate tethering provisioning"
Erik Kline [Tue, 10 Apr 2018 03:16:07 +0000 (03:16 +0000)]
Merge "Trigger NetworkCallback events when private DNS usage has changed."
dalyk [Mon, 5 Mar 2018 17:42:22 +0000 (12:42 -0500)]
Trigger NetworkCallback events when private DNS usage has changed.
Relies on events sent from netd in aosp/578162.
Test: Added tests to ConnectivityServiceTest. Added a new test
class DnsManagerTest. Built a simple app that appears to
receive onLinkProperties events correctly upon manual changes
to the private DNS settings on a Pixel.
Bug:
71828272
Change-Id: I68665aaf74b7d59182cc6f9586b80b55b0dfe427
Erik Kline [Mon, 9 Apr 2018 08:51:34 +0000 (01:51 -0700)]
Merge "Support bluetooth not using MultinetworkPolicyTracker"
am:
ed631bf5aa
Change-Id: I889e58c1e102f6b0cddebed4454f30fad701b025
Treehugger Robot [Mon, 9 Apr 2018 07:55:50 +0000 (07:55 +0000)]
Merge "Support bluetooth not using MultinetworkPolicyTracker"
Erik Kline [Mon, 12 Mar 2018 14:18:58 +0000 (23:18 +0900)]
Support bluetooth not using MultinetworkPolicyTracker
This required advancing the IpManager to IpClient refactoring
(Bluetooth used IpManager and friends). Most importantly, the
Bluetooth code used WaitForProvisioningCallback, so this is
moved into IpClient proper now. Also: some more renaming
cleanup.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
62476366
Bug:
72663849
Change-Id: I9eee2a9d5c31cdd48a054a7edc3403584efb1864
Erik Kline [Wed, 28 Feb 2018 06:01:35 +0000 (15:01 +0900)]
Don't unnecessarily reevaluate tethering provisioning
Registering for carrier config changes can deliver a sticky broadcast
and can cause Tethering to think something has changed and reevaluate
provisioning status, even though this has been checked before it
entered tethering mode alive state.
Additionally, move the provisioning_app{,no_ui} resources into the
TetheringConfiguration, if for no other reason than now we can log
it in .toString().
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- manual USB tethering toward WiFi works
Bug:
69565814
Change-Id: Ib8b2620ce44c55e5eb0afd3f00f3f5aa4fc8a593
Hansong Zhang [Sat, 7 Apr 2018 00:00:59 +0000 (17:00 -0700)]
Merge "Bluetooth: Add hidden API to get current user of HID Device (1/3)"
am:
d61e87ad08
Change-Id: I919f0be242b532207d31cd32511da86ebbbc9fe3
Treehugger Robot [Fri, 6 Apr 2018 21:54:06 +0000 (21:54 +0000)]
Merge "Bluetooth: Add hidden API to get current user of HID Device (1/3)"
Daniel Colascione [Fri, 6 Apr 2018 18:40:13 +0000 (11:40 -0700)]
Merge "Clarify doc comment for android.os.Build.VERSION.RELEASE"
am:
fe79660d1e
Change-Id: I907c8d585bd4fcea3240b27a9c58343daeb4044a
Jayachandran Chinnakkannu [Fri, 6 Apr 2018 17:42:07 +0000 (10:42 -0700)]
Merge "Correct the value of RESOURCES_UNAVAILABLE_OR_UNSPECIFIED"
am:
0222c2cac1
Change-Id: Ie8e1c31b5afadf9d33e179474f4d810e8cf6c74f
Treehugger Robot [Fri, 6 Apr 2018 17:17:25 +0000 (17:17 +0000)]
Merge "Clarify doc comment for android.os.Build.VERSION.RELEASE"
Jayachandran Chinnakkannu [Fri, 6 Apr 2018 16:31:15 +0000 (16:31 +0000)]
Merge "Correct the value of RESOURCES_UNAVAILABLE_OR_UNSPECIFIED"
Daniel Colascione [Fri, 6 Apr 2018 15:12:05 +0000 (08:12 -0700)]
Clarify doc comment for android.os.Build.VERSION.RELEASE
The RELEASE field has no guaranteed internal structure and developers
should not attempt to parse it.
Test: no code changes
Change-Id: I0ea3ab5ba5dd4cc733feb62725cf7c62c00c857b
Jayachandran C [Fri, 6 Apr 2018 08:10:38 +0000 (01:10 -0700)]
Correct the value of RESOURCES_UNAVAILABLE_OR_UNSPECIFIED
Test: Build
Bug:
77657541
Change-Id: Ia6b576c222776cbc7e54e15cb54e39775e76ea56
Dan Albert [Fri, 6 Apr 2018 02:32:06 +0000 (19:32 -0700)]
Merge "Remove an API that doesn't exist."
am:
454b1e37eb
Change-Id: I8ef8a0dabb8840faee9d601bae49794126fa40ee
Erik Kline [Fri, 6 Apr 2018 01:38:08 +0000 (18:38 -0700)]
Merge "Move the logic of (re)evaluation of Private DNS"
am:
04233ef175
Change-Id: Ic510dabd6a2d40cd6d33a21e0128d85a0126127f
Treehugger Robot [Fri, 6 Apr 2018 00:31:20 +0000 (00:31 +0000)]
Merge "Remove an API that doesn't exist."
Treehugger Robot [Thu, 5 Apr 2018 23:52:55 +0000 (23:52 +0000)]
Merge "Move the logic of (re)evaluation of Private DNS"
Erik Kline [Wed, 21 Mar 2018 14:18:33 +0000 (07:18 -0700)]
Move the logic of (re)evaluation of Private DNS
Moves this out of ConnectivityService and into each NetworkMonitor
(where it's more self-contained).
Test: as follows
- builds, flashes, boots
- runtest frameworks-net passes
- manual testing with working and non-working hostnames behaves
somewhat (but not entirely) as expected, and not always quickly
Bug:
64133961
Bug:
72345192
Bug:
73872000
Bug:
77140445
Change-Id: Ic4322af3cb49149f2d975cb31f54b2ac7927f907
Dan Albert [Thu, 5 Apr 2018 22:00:00 +0000 (15:00 -0700)]
Remove an API that doesn't exist.
Apparently this was removed in Jelly Bean:
https://stackoverflow.com/q/
24312632/632035. Keeping the decl in the
NDK just confuses people: https://stackoverflow.com/q/
49646596/632035.
Test: make checkbuild
Bug: None
Change-Id: If549fcd8f4052e633646c4ce8a054a0bbcd8b2bf
Dan Willemsen [Thu, 5 Apr 2018 00:46:12 +0000 (17:46 -0700)]
Merge "Remove duplicate definitions of utility variables"
am:
8d5a39ac62
Change-Id: I38a6dff84d3ccad0a1b895a4416b14e59c406953
Siarhei Vishniakou [Wed, 4 Apr 2018 23:56:02 +0000 (16:56 -0700)]
Merge "Add Polish keycharactermap"
am:
3b5016598d
Change-Id: I554316c67876f27c8a55c351d7192eea4bb1c524
Hansong Zhang [Wed, 4 Apr 2018 23:50:40 +0000 (16:50 -0700)]
Merge "Hearing Aid: change get/set active device (3/3)"
am:
a23007dd54
Change-Id: I0760912dd11edf7f3db443d663644b0ceb415f0e
Treehugger Robot [Wed, 4 Apr 2018 23:04:08 +0000 (23:04 +0000)]
Merge "Remove duplicate definitions of utility variables"
Treehugger Robot [Wed, 4 Apr 2018 22:10:19 +0000 (22:10 +0000)]
Merge "Add Polish keycharactermap"
Treehugger Robot [Wed, 4 Apr 2018 21:42:17 +0000 (21:42 +0000)]
Merge "Hearing Aid: change get/set active device (3/3)"
tiansiming [田思明] [Wed, 4 Apr 2018 19:47:13 +0000 (12:47 -0700)]
Merge "Modify isShowing method in Dialog"
am:
46be1f15af
Change-Id: I9d1cd55d51c37571d199ebbb5975f490e0969a92
Benedict Wong [Wed, 4 Apr 2018 19:43:36 +0000 (12:43 -0700)]
Merge "Force creation of Socket upon Transform application"
am:
119cf2bc61
Change-Id: Ia19da86a3fa40e309ff7a079307a8a63de8ba796
Treehugger Robot [Wed, 4 Apr 2018 18:39:38 +0000 (18:39 +0000)]
Merge "Modify isShowing method in Dialog"
Benedict Wong [Wed, 4 Apr 2018 17:14:46 +0000 (17:14 +0000)]
Merge "Force creation of Socket upon Transform application"
Chen Xu [Wed, 4 Apr 2018 04:52:13 +0000 (21:52 -0700)]
Merge "throw runtimeException for applicable TM APIs"
am:
63437f247b
Change-Id: I3d0bcc477917c2fe27bf8024190d0f1bbd2fa585
Mathieu Chartier [Wed, 4 Apr 2018 03:57:41 +0000 (20:57 -0700)]
Merge "Add dedicated flag to control app image generation"
am:
abf1476dbe
Change-Id: If1047435f3b74443e2508a265500acf4ed1c7b53
Chen Xu [Wed, 4 Apr 2018 03:17:39 +0000 (03:17 +0000)]
Merge "throw runtimeException for applicable TM APIs"
tiansiming [田思明] [Fri, 9 Mar 2018 09:19:12 +0000 (17:19 +0800)]
Modify isShowing method in Dialog
The method isShowing in Dialog.java is to judge whether
the dialog is currently showing, but it will return true
when the dialog is hidden.
Bug:
74416088
Test: modify testShow in DialogTest.java (see 639879)
run cts -m CtsAppTestCases -t android.app.cts.DialogTest#testShow
Change-Id: Ibf15e080678f414f8a66ff0841be17a2f9d2d652
Signed-off-by: tiansiming [田思明] <tiansiming@xiaomi.com>
Mathieu Chartier [Wed, 4 Apr 2018 02:14:51 +0000 (02:14 +0000)]
Merge "Add dedicated flag to control app image generation"
fionaxu [Fri, 23 Mar 2018 18:52:44 +0000 (11:52 -0700)]
throw runtimeException for applicable TM APIs
1. This CL revert some API change from ag/
3710629.
2. throw runtime exception when running in a non-1000 UID.
3. throw for methods that persist some sort of state and readers could continue to
return placeholder values.
4. for rest of TelephonyManager API cleanup b/
74401420.
Bug:
74016743
Test: Build
Change-Id: I2846efc11eebce4a923762f56f09daaf37c44763
(cherry picked from commit
f20f0d916f2326bee618600119107da1a8ae15a8)
Merged-in: I2846efc11eebce4a923762f56f09daaf37c44763
Benedict Wong [Tue, 3 Apr 2018 01:12:34 +0000 (18:12 -0700)]
Force creation of Socket upon Transform application
This change forces Socket and DatagramSocket to populate the
SocketImpl, ensuring that the socket file descriptor can be
retrieved when applying Transport mode Transforms
This is done by calling getSoLinger(), triggering a getImpl(), which
triggers setImpl() if needed.
Bug:
77491294
Test: Added tests in IpSecManagerTest, ran on walleye
Change-Id: I40da08b031357710eb794e0f866aec5660c79594
Mathieu Chartier [Tue, 13 Mar 2018 00:11:07 +0000 (17:11 -0700)]
Add dedicated flag to control app image generation
Also disable the flag for split APKs.
Bug:
72696798
Test: manual
(cherry picked from commit
a9c343386d5505d7111aee3c1ffec409c9730f21)
Merged-In: I25007500e221744a218b165dde41ca9db19b1832
Change-Id: I1dc3137307834d948b52af18205ca47dc8dc7e67
Erik Kline [Tue, 3 Apr 2018 21:17:23 +0000 (14:17 -0700)]
Merge "Support bypassing TLS in the framework"
am:
aef9956de2
Change-Id: I5b8cc38ec136f10a4e61f7edf7a9b4945b80b595
Andreas Gampe [Tue, 3 Apr 2018 20:29:06 +0000 (13:29 -0700)]
Merge "Frameworks: In the kill handler, ensure the logging handler was run"
am:
c0ac9e916f
Change-Id: Ica29cdf9a4b17b6cec957093c35b735d64568029
Treehugger Robot [Tue, 3 Apr 2018 19:56:19 +0000 (19:56 +0000)]
Merge "Support bypassing TLS in the framework"
Ruchi Kandoi [Tue, 3 Apr 2018 19:17:37 +0000 (12:17 -0700)]
Merge "Add an Executor for the onConnectedListener"
am:
0d1f7933a3
Change-Id: Ie1075238c6339c7964c14ef82f6db2d499ca03a3
Hansong Zhang [Tue, 3 Apr 2018 19:12:53 +0000 (12:12 -0700)]
Bluetooth: Add hidden API to get current user of HID Device (1/3)
Bug:
69136526
Test: test with apps using HID Device profile
Change-Id: If0e49840257c877c975c2da176a08e613668cbc3
Stanley Tng [Mon, 19 Mar 2018 19:28:56 +0000 (12:28 -0700)]
Add min_ce/max_ce parameters to requestLeConnectionUpdate()
Add new test parameters, min_ce and max_ce, to the SL4A tests for LE
Connection-oriented Channel (CoC) feature. This CL passes these 2
parameters to native stack.
Test: Run cmd: act.py -c $MY_SL4A_CONFIG -tc BleCoc2ConnTest
Bug:
77528723
Change-Id: I9d3d74f671772014209f8114c2d1b8ba606c54d5
Treehugger Robot [Tue, 3 Apr 2018 18:13:45 +0000 (18:13 +0000)]
Merge "Frameworks: In the kill handler, ensure the logging handler was run"
Pankaj Kanwar [Tue, 3 Apr 2018 17:33:40 +0000 (10:33 -0700)]
Merge "Address IMSI privacy issues."
am:
644d5ea61c
Change-Id: Ib64e54022279c886126477e152f9acd835d45913
Ruchi Kandoi [Tue, 3 Apr 2018 16:48:18 +0000 (16:48 +0000)]
Merge "Add an Executor for the onConnectedListener"
Pankaj Kanwar [Tue, 3 Apr 2018 16:05:51 +0000 (16:05 +0000)]
Merge "Address IMSI privacy issues."
Andreas Gampe [Mon, 2 Apr 2018 21:00:47 +0000 (14:00 -0700)]
Frameworks: In the kill handler, ensure the logging handler was run
In the KillApplicationHandler for uncaught exceptions ensure that the
LoggingHandler has been run. This ensures logging when code directly
calls getUncaughtExceptionHandler().uncaughtException().
Bug:
29624607
Bug:
73380984
Test: m
Test: manual
Change-Id: I9c9216714b4cf029d7ed21e29313c0e802345337
Erik Kline [Wed, 21 Mar 2018 14:18:33 +0000 (07:18 -0700)]
Support bypassing TLS in the framework
This change comprises the following parts:
[1] android.net.dns.ResolvUtil, containing methods that encapsulate the
use of the high bit in netids used in DNS resolution contexts.
[2] Updates to captive portal apps to call the ResolvUtil method that
enables DNS-over-TLS bypass for the captive portal app process.
Test: as follows
- builds
- flashes
- boots
- runtest frameworks-net passes
Bug:
64133961
Bug:
72345192
Change-Id: I2072c1f68d6978fa0d7e9d8693135a2c51bb0f87
Hall Liu [Tue, 3 Apr 2018 01:30:51 +0000 (18:30 -0700)]
Merge "Change signature of requestBluetoothAudio"
am:
545e20389d
Change-Id: I9fc7399bf01bbe0c1def43cc9cf543c0000b827c
pkanwar [Mon, 20 Nov 2017 02:08:40 +0000 (18:08 -0800)]
Address IMSI privacy issues.
Added method resetCarrierKeysForImsiEncryption
to allow for keys to be reset.
Bug:
35606429
Test: manual
Change-Id: Id2e92917b50fa2163b2bab112df6e80b5e9c5795
Merged-In: Id2e92917b50fa2163b2bab112df6e80b5e9c5795
Hall Liu [Tue, 3 Apr 2018 00:14:58 +0000 (00:14 +0000)]
Merge "Change signature of requestBluetoothAudio"
Ruchi Kandoi [Mon, 2 Apr 2018 20:31:47 +0000 (13:31 -0700)]
Add an Executor for the onConnectedListener
Test: Run CtsOmapiTestCases
Bug:
76448978
Change-Id: Ieb30b8935961db25bd058e1c41c127fa5a4437ff
Erik Kline [Mon, 2 Apr 2018 20:57:43 +0000 (20:57 +0000)]
Merge "Refactor isTetheringSupported() calls"
am:
e34c426fd3
Change-Id: Iecc4e563f151545facc23f4a24a8dbf2d6ab9822
Hall Liu [Mon, 2 Apr 2018 20:52:57 +0000 (13:52 -0700)]
Change signature of requestBluetoothAudio
requestBluetoothAudio now takes a BluetoothDevice instead of a string.
Bug:
74408978
Test: unable to CTS -- can't emulate bluetooth devices
Change-Id: Id21e32b911da234f69a248e9937f9df0cf12a9a9
Xiangyu/Malcolm Chen [Mon, 2 Apr 2018 19:54:57 +0000 (19:54 +0000)]
Merge "Adding debug message inside NetworkServiceCallback."
am:
9bbfe5c14c
Change-Id: Ida0d753a46f7aef9f0596d414edab8d36ea24b82
Treehugger Robot [Mon, 2 Apr 2018 18:47:18 +0000 (18:47 +0000)]
Merge "Refactor isTetheringSupported() calls"
Xiangyu/Malcolm Chen [Mon, 2 Apr 2018 18:43:01 +0000 (18:43 +0000)]
Merge "Adding debug message inside NetworkServiceCallback."
Bernie Innocenti [Mon, 2 Apr 2018 18:13:42 +0000 (18:13 +0000)]
Merge "APF: drop multicast ICMPv6 while in doze mode"
am:
7880e284c8
Change-Id: Ie0b719e2f7391d02c859e9961fc72550c64a5249
Treehugger Robot [Mon, 2 Apr 2018 13:57:43 +0000 (13:57 +0000)]
Merge "APF: drop multicast ICMPv6 while in doze mode"
Bernie Innocenti [Wed, 28 Mar 2018 11:11:49 +0000 (20:11 +0900)]
APF: drop multicast ICMPv6 while in doze mode
Some WiFi hotspots send excessive multicast IPv6 ping requests which
cause considerable power drain. Thus, drop all multicast ICMPv6 ping
requests while the device is in doze mode.
Bug:
66930077
Test: runtest -x tests/net/java/android/net/apf/ApfTest.java
Test: manual - compared generated APF bytecode using apf_disassembler
Test: manual - force idle mode while sending multicast pings to device
Change-Id: I25dbf99985cf4413b4d0e3920d281fe6d663197a
Hall Liu [Sat, 31 Mar 2018 02:36:45 +0000 (02:36 +0000)]
Merge "Make changes to MBMS API following recs"
am:
feb60e0864
Change-Id: I748bdcb23538f7c5e5d9bcc005df32fddd42602a
Pavlin Radoslavov [Sat, 31 Mar 2018 01:46:33 +0000 (01:46 +0000)]
Merge "Update Bluetooth codec related strings"
am:
d10fd55a91
Change-Id: Ie28703025f732e33abeac2e7d8121bc93eaa3db9
Ruchi Kandoi [Sat, 31 Mar 2018 01:43:18 +0000 (01:43 +0000)]
Merge "Make OMAPI stricter"
am:
998ef794a3
Change-Id: I34232eea503b3d95b22d4a8fa9e366c857264e78
Hall Liu [Sat, 31 Mar 2018 00:28:06 +0000 (00:28 +0000)]
Merge "Make changes to MBMS API following recs"
Erik Kline [Fri, 9 Mar 2018 05:18:02 +0000 (14:18 +0900)]
Refactor isTetheringSupported() calls
Tethering currently wants access to complex isTetheringSupported
logic that is only available in ConnectivityService. Instead of
trying to access that via ConnectivityManager, pass this capability
in to Tethering directly, in the TetheringDependencies object.
Also:
- ConnectivityManager is only a source of static constants now,
so "import static" all the constants that are actually used.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net works
- manual USB towards WiFi tethering works
Bug:
68951715
Change-Id: Ia64faaadefb4a5d84a50da98bdebd544b6fda101
Treehugger Robot [Sat, 31 Mar 2018 00:16:42 +0000 (00:16 +0000)]
Merge "Update Bluetooth codec related strings"
Malcolm Chen [Fri, 30 Mar 2018 02:05:12 +0000 (19:05 -0700)]
Adding debug message inside NetworkServiceCallback.
Adding debug message inside NetworkServiceCallback when mCallback
is null.
Bug:
76392715
Test: existing test
Change-Id: Icd27d4082e1e4b60efe65abfff99c4165717fd4a
Merged-In: Icd27d4082e1e4b60efe65abfff99c4165717fd4a
Ruchi Kandoi [Fri, 30 Mar 2018 23:29:08 +0000 (23:29 +0000)]
Merge "Make OMAPI stricter"
Ruchi Kandoi [Tue, 27 Mar 2018 17:03:34 +0000 (10:03 -0700)]
Make OMAPI stricter
- Channel implements java.nio.Channels.Channel.
- openBasicChannel(aid) and openLogicalChannel(aid) is added back.
- Add finalizers for the classes.
- SecureElementListener -> onConnectedListener
Bug:
76448978
Test: CtsOmapiTestCases
Change-Id: I7f92c4dcb5c08a72d32ac9440872ab853badec1d
Paul Jensen [Fri, 30 Mar 2018 22:03:22 +0000 (22:03 +0000)]
Merge "Fix socket leaks in various android.net.Network methods."
am:
34ce11f2bd
Change-Id: I1a59fced1f3bcd19bd48150ca215093dff431619
Hall Liu [Wed, 28 Mar 2018 22:54:07 +0000 (15:54 -0700)]
Make changes to MBMS API following recs
* Change all error handling logic to return an error code via the async
callback
* Add an UNKNOWN code for errors for future backwards compatibility, and
prohibit the middleware from sending this code.
* Add IntDef for errors through the async callback
* Amend documentation for download()
* Implement support for arranging downloaded files into a hierarchy
following that of the server.
Change-Id: I4d5c8f6229b216d9aa84397e628e62279033cc74
Fixes:
76449215
Test: CTS
Treehugger Robot [Fri, 30 Mar 2018 20:52:42 +0000 (20:52 +0000)]
Merge "Fix socket leaks in various android.net.Network methods."
Pavlin Radoslavov [Fri, 30 Mar 2018 09:55:39 +0000 (02:55 -0700)]
Update Bluetooth codec related strings
The settings related to Bluetooth codec selection
are actually triggers. Updated the corresponding
strings to reflect that.
Bug:
67682722
Test: Manual - examined the result UI
runtest systemui
make -j40 RunSettingsRoboTests
make -j40 RunSettingsLibRoboTests
Change-Id: I872414f7620931a67b028c2997b0740ae3a45986
Merged-In: I872414f7620931a67b028c2997b0740ae3a45986
(cherry picked from commit
a80a65a11fc6fd6aa7f3dfb19516c3d15c512dfb)
Paul Jensen [Thu, 29 Mar 2018 11:41:43 +0000 (07:41 -0400)]
Fix socket leaks in various android.net.Network methods.
Bug:
72124526
Test: make CtsNetTestCases
Merged-In: I2a2254ce65c2176ae0be1d6276034b1bb0cad987
Merged-In: I23150482d6c2ab2eaa2b37732af68af69320792b
Change-Id: I3398b67272360f894e01a8cdfbc47b17d77c2330
(cherry picked from commit
89bb993293f0d7a524d1404184a55584b59bb67c)
Bernie Innocenti [Fri, 30 Mar 2018 13:05:05 +0000 (13:05 +0000)]
Merge "apf: adjust JNI to accept_packet()'s new signature"
am:
786150bc09
Change-Id: I966776e6574cbf167a6148e20d40e2bdcc887327