OSDN Git Service
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 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
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
Bernie Innocenti [Fri, 30 Mar 2018 11:51:41 +0000 (11:51 +0000)]
Merge "apf: adjust JNI to accept_packet()'s new signature"
Bernie Innocenti [Fri, 30 Mar 2018 09:25:47 +0000 (09:25 +0000)]
Merge "Relax APF version check in ApfGenerator"
am:
51dab0ed9d
Change-Id: Id8d2d9df1e562ae15e63ba50e65ab6e67dab108c
Lorenzo Colitti [Fri, 30 Mar 2018 08:47:25 +0000 (08:47 +0000)]
Merge "Mark networks with OEM_PAID always restricted"
am:
8e338f7dae
Change-Id: I4ffcf01e1f79c8a3570ea2b819688b55904939fe
Chalard Jean [Fri, 30 Mar 2018 08:42:42 +0000 (08:42 +0000)]
Merge "Limit the number of routes for performance"
am:
b8a1509d68
Change-Id: If4de2779b24560f75a7bb977dbb0f996115a0648
Chalard Jean [Fri, 30 Mar 2018 08:36:58 +0000 (08:36 +0000)]
Merge "Clarify documentation for getActiveNetworkInfo and friends"
am:
39d6694208
Change-Id: I167776fb6ec44aff4b35b58378b54e3b55907427
Bernie Innocenti [Fri, 30 Mar 2018 08:12:02 +0000 (17:12 +0900)]
apf: adjust JNI to accept_packet()'s new signature
Test: Fixes the build breakage
Change-Id: Id5c3cec5459ce6f9693457448002e60bbca6c09b
Lorenzo Colitti [Fri, 30 Mar 2018 07:39:01 +0000 (07:39 +0000)]
Merge "Disallow Reserved SPI Allocation"
am:
7fcde83572
Change-Id: Idd387dfad8d8886fad28005f9001a732a73cae1b
Bernie Innocenti [Fri, 30 Mar 2018 07:25:08 +0000 (07:25 +0000)]
Merge "Relax APF version check in ApfGenerator"
Lorenzo Colitti [Fri, 30 Mar 2018 07:00:54 +0000 (07:00 +0000)]
Merge "Mark networks with OEM_PAID always restricted"
Pavel Maltsev [Wed, 7 Mar 2018 22:33:22 +0000 (14:33 -0800)]
Mark networks with OEM_PAID always restricted
Bug:
68762530
Exempt-From-Owner-Approval: OWNERS have approved, but gerrit doesn't see it
Test: runtest -x frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest
Change-Id: Ieadef7c42634d890281543226203530fb18eb0a3
Lorenzo Colitti [Fri, 30 Mar 2018 06:48:22 +0000 (06:48 +0000)]
Merge "Require explicitly supplied truncation length"
am:
0dde066ef7
Change-Id: I20f7f910f4f0369e38eebd0b7fe6970331763e85
Chalard Jean [Fri, 30 Mar 2018 06:40:29 +0000 (06:40 +0000)]
Merge "Limit the number of routes for performance"
Chalard Jean [Fri, 30 Mar 2018 06:37:22 +0000 (06:37 +0000)]
Merge "Clarify documentation for getActiveNetworkInfo and friends"
Lorenzo Colitti [Fri, 30 Mar 2018 06:35:22 +0000 (06:35 +0000)]
Merge "Clarify UDP encapsulation socket API"
am:
2891409c93
Change-Id: Ie1e7ea81440afee2618211d989989cf5daff3e1e
Lorenzo Colitti [Fri, 30 Mar 2018 06:16:17 +0000 (06:16 +0000)]
Merge "Disallow Reserved SPI Allocation"
Lorenzo Colitti [Fri, 30 Mar 2018 04:59:22 +0000 (04:59 +0000)]
Merge "Require explicitly supplied truncation length"
Lorenzo Colitti [Fri, 30 Mar 2018 04:58:47 +0000 (04:58 +0000)]
Merge "Clarify UDP encapsulation socket API"
Bernie Innocenti [Fri, 30 Mar 2018 04:08:26 +0000 (13:08 +0900)]
Relax APF version check in ApfGenerator
Instead of requiring an *exact* version, we now require a minimum
version. This is necessary if we wish to upgrade the APF interpreter in
vendor firmware independently of the framework code. Adding new opcodes
without changing the semantics of the old ones is always possible and
usually easy, so we can at least have a backwards-compatibility horizon
wider than a single version.
Change-Id: I4f1ed661afb2ede193188eb8086fbf2a8b45b33d
Test: Change extracted from aosp/647079 and tested there
Calin Juravle [Fri, 30 Mar 2018 04:08:47 +0000 (04:08 +0000)]
Merge "Add the compilation reason to the dexopt dumps"
am:
d136b0fb08
Change-Id: Id15de7a3a32835b2dabcef668845b6605a070c68
Remi NGUYEN VAN [Fri, 30 Mar 2018 02:21:53 +0000 (02:21 +0000)]
Merge "Use InterfaceSet for upstream interfaces."
am:
e18fd9fff0
Change-Id: I4fa2446fe67ba2d88e4230f9accdfe0b8d2ec241
Bookatz [Fri, 30 Mar 2018 01:32:57 +0000 (01:32 +0000)]
Merge "Dummy WorkChain class"
am:
81270b1885
Change-Id: Id8caf73e4dcb0b230cd57fe485c2768decf1d8eb
Treehugger Robot [Fri, 30 Mar 2018 01:20:26 +0000 (01:20 +0000)]
Merge "Add the compilation reason to the dexopt dumps"
Remi NGUYEN VAN [Fri, 30 Mar 2018 01:05:38 +0000 (01:05 +0000)]
Merge "Use InterfaceSet for upstream interfaces."
Hansong Zhang [Wed, 28 Mar 2018 23:53:10 +0000 (16:53 -0700)]
Hearing Aid: change get/set active device (3/3)
* setActiveDevice() returns false in error case, e.g. when the device is
not connected
* add getActiveDevices() instead of isActiveDevice(), which returns a list
that must have two elements: left and right, or empty list on error
Test: manual
Bug:
69623109
Change-Id: I48f3388c56434d0c21e09bd8b794e58848cd8794
Treehugger Robot [Fri, 30 Mar 2018 00:17:37 +0000 (00:17 +0000)]
Merge "Dummy WorkChain class"
John Reck [Thu, 29 Mar 2018 22:54:56 +0000 (22:54 +0000)]
Merge "Change shader precision because of CTS fail"
am:
9ab5045d92
Change-Id: Ic4f411ddb7a0e7015c283151dc97669f75ffb6b1
Victor Hsieh [Thu, 29 Mar 2018 21:49:29 +0000 (21:49 +0000)]
Merge "Fix seccomp filter set up in zygote"
am:
29d32fb55b
Change-Id: Ie2a052905ae6703b45c951c852aa786c41a8a7f9
John Reck [Thu, 29 Mar 2018 21:04:05 +0000 (21:04 +0000)]
Merge "Change shader precision because of CTS fail"
Victor Hsieh [Thu, 29 Mar 2018 20:37:33 +0000 (20:37 +0000)]
Merge "Fix seccomp filter set up in zygote"
Calin Juravle [Thu, 29 Mar 2018 02:00:18 +0000 (19:00 -0700)]
Add the compilation reason to the dexopt dumps
Knowing why we compiled a package will make some investigations easier.
Test: adb shell dumpsys package dexopt
Bug:
76425903
Change-Id: I67b5bc980d198340aa52affb24fb3ce7e3080d67
dohyunia.kim [Wed, 8 Nov 2017 06:46:56 +0000 (15:46 +0900)]
Change shader precision because of CTS fail
Change-Id: I5d8747ecf9091a251b56d3a9de4bdb8ab0260898
Merged-In: I5d8747ecf9091a251b56d3a9de4bdb8ab0260898
Cassie [Thu, 29 Mar 2018 18:11:34 +0000 (18:11 +0000)]
Merge "Move alpha long/short to the base CellIdentity according API Review."
am:
b57de56276
Change-Id: I088b1751c63f6b21c8452a07649751ac0b9989e5
Treehugger Robot [Thu, 29 Mar 2018 16:45:52 +0000 (16:45 +0000)]
Merge "Move alpha long/short to the base CellIdentity according API Review."
Greg Kaiser [Thu, 29 Mar 2018 16:45:00 +0000 (16:45 +0000)]
Merge "tools/bit: Avoid leak in error condition"
am:
db43124b01
Change-Id: I4ab166872dc985c98d4771d4715a0d059de80dd7
Bookatz [Wed, 28 Mar 2018 20:59:41 +0000 (13:59 -0700)]
Dummy WorkChain class
To avoid future merge conflicts, a dummy WorkChain class must be
added temporarily. It goes along with the dummy StatsLog.java class.
Bug:
71607284
Test: none
Merged-In: Iff361eb98e079c7b2146c092dc27a3618a813c94
Change-Id: I66cf0c36c1842b99a5a4dd104fc5c06c0cfbe2b5
Treehugger Robot [Thu, 29 Mar 2018 15:22:55 +0000 (15:22 +0000)]
Merge "tools/bit: Avoid leak in error condition"
Juancheng Rong [Thu, 29 Mar 2018 09:55:00 +0000 (09:55 +0000)]
Merge "Fixed the Premium SMS bug reported by our partner The detail is that : === <shortcode country="ae" free="3214|1017"/> === As displayed above, Arab Emirates is registered in sms_short_codes.xml. There is only CATEGORY_FREE_SHORT_CODE number for the county code "ae". All other numbers which include length under 5 digits is set as CATEGORY_NOT_SHORT_CODE, and so Premium SMS pop-up does not appear for both case. pattern="\\d{1,5}" is added to all similar entries BUG:
66911380"
am:
e2e7b28c12
Change-Id: I32baf21b481635925870814387ec2d32ab36a7e2
Remi NGUYEN VAN [Fri, 9 Mar 2018 05:07:18 +0000 (14:07 +0900)]
Use InterfaceSet for upstream interfaces.
Allows using different upstream interfaces for IPv4 and IPv6.
Bug:
38218697
Bug:
64382985
Bug:
64976379
Bug:
64995262
Bug:
64380515
Test: runtest frameworks-net, manual (with aosp/644099 applied)
Change-Id: I3db63f7aa5255a0229253187def7590a386c5133
Chalard Jean [Thu, 29 Mar 2018 05:10:44 +0000 (14:10 +0900)]
Limit the number of routes for performance
In evaluating whether "most" of the addressing space is
covered, the list of routes are obtained from a third-party
app, so it's possbile the system service stalls unless
some limit is enforced on how much work it has to do.
This change limits the number of routes to 400, as determined
by time measurement on various devices.
Bug:
74176086
Test: runtest framework-net
Change-Id: Ie4a96098bc044ade87b188839586f14dd101c100
Chalard Jean [Thu, 29 Mar 2018 08:45:24 +0000 (17:45 +0900)]
Clarify documentation for getActiveNetworkInfo and friends
For VPNs it's unobvious what these methods do, so document that.
Bug:
70917007
Test: Comment changes only. Checkdoc passes.
Change-Id: I31ec1aea356d88d969eaf9fc7d8c2ed13ce924eb
JC [Thu, 29 Mar 2018 09:06:39 +0000 (09:06 +0000)]
Merge "DCB whitelist short code for user association"
am:
722282ec62
Change-Id: Id8c380c715a94336cd21af4b6a3e3ae9da11a1e1
Treehugger Robot [Thu, 29 Mar 2018 07:40:39 +0000 (07:40 +0000)]
Merge "Fixed the Premium SMS bug reported by our partner The detail is that : === <shortcode country="ae" free="3214|1017"/> === As displayed above, Arab Emirates is registered in sms_short_codes.xml. There is only CATEGORY_FREE_SHORT_CODE number for the county code "ae". All other numbers which include length under 5 digits is set as CATEGORY_NOT_SHORT_CODE, and so Premium SMS pop-up does not appear for both case. pattern="\\d{1,5}" is added to all similar entries BUG:
66911380"
Remi NGUYEN VAN [Thu, 29 Mar 2018 07:36:21 +0000 (07:36 +0000)]
Merge "Fix network usage stats on 464xlat tethered."
am:
83088dcd8e
Change-Id: I0e13c2a6b9f6b5d0701a073ddc835781d5d2aace
Treehugger Robot [Thu, 29 Mar 2018 07:29:00 +0000 (07:29 +0000)]
Merge "DCB whitelist short code for user association"
Remi NGUYEN VAN [Thu, 29 Mar 2018 06:04:02 +0000 (06:04 +0000)]
Merge "Fix network usage stats on 464xlat tethered."
Hansong Zhang [Thu, 29 Mar 2018 01:28:41 +0000 (01:28 +0000)]
Merge "Bluetooth HIDD: Remove unplug()"
am:
18aa649b8f
Change-Id: I2daad6cc9185c1d81dad440574e392752bece7fd
Hall Liu [Thu, 29 Mar 2018 01:25:09 +0000 (01:25 +0000)]
Merge "Add additional logging for EMBMS edge cases"
am:
de57d0d024
Change-Id: If9af4947275e18154c93d9d8f6756cac16317768