OSDN Git Service
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
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."
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 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
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 11:51:41 +0000 (11:51 +0000)]
Merge "apf: adjust JNI to accept_packet()'s new signature"
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
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
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: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
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."
Treehugger Robot [Fri, 30 Mar 2018 00:17:37 +0000 (00:17 +0000)]
Merge "Dummy WorkChain class"
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
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."
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"
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
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"
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."
Benedict Wong [Wed, 28 Mar 2018 20:10:40 +0000 (13:10 -0700)]
Require explicitly supplied truncation length
Instead of providing default truncation lengths (based on RFC or
otherwise), this change imposes a restriction that the truncation length
must be supplied for all auth or aead algorithms.
Bug:
77204048
Test: Updated tests, ran on walleye
Change-Id: I4a0e2e71aa97259e56f44e7c8a2ce53135708d97
Victor Hsieh [Wed, 28 Mar 2018 23:26:28 +0000 (16:26 -0700)]
Fix seccomp filter set up in zygote
This needs to land with extra syscalls whitelisted, including capset and
setresuid. These privileged syscalls are used in the setup after the
filter is initialized.
Test: system starts, different apps run
Bug:
63944145
Bug:
76461821
Change-Id: I49e6b292805f35baffb3530461c8741e75aceb32
Treehugger Robot [Wed, 28 Mar 2018 23:02:57 +0000 (23:02 +0000)]
Merge "Bluetooth HIDD: Remove unplug()"
Cassie [Wed, 21 Mar 2018 23:20:34 +0000 (16:20 -0700)]
Move alpha long/short to the base CellIdentity according API Review.
Bug:
74831568
Test: Telephony sanity
Change-Id: I0ef69e3f18fca111191e1c6329ae13c0860869ba
Merged-In: I0ef69e3f18fca111191e1c6329ae13c0860869ba
Hall Liu [Wed, 28 Mar 2018 22:25:44 +0000 (22:25 +0000)]
Merge "Add additional logging for EMBMS edge cases"
Holly Jiuyu Sun [Wed, 28 Mar 2018 21:56:40 +0000 (21:56 +0000)]
Merge "Address comments from API Review."
Treehugger Robot [Wed, 28 Mar 2018 21:25:13 +0000 (21:25 +0000)]
Merge "Remove non-tombstoned ANR path."
Hansong Zhang [Wed, 28 Mar 2018 19:56:05 +0000 (12:56 -0700)]
Bluetooth HIDD: Remove unplug()
Remove the hidden unplug() API because it is not used and it can cause
the remote device to be unpaired. System apps should use unbond() and
user apps should not use reflection to invoke it.
Bug:
67866553
Test: SL4A
Change-Id: I1bdc06dbb5460c9fd52230b78cbf9434a4349d24
Treehugger Robot [Wed, 28 Mar 2018 18:40:17 +0000 (18:40 +0000)]
Merge "Clean new TelephonyManager API."
Treehugger Robot [Wed, 28 Mar 2018 18:06:31 +0000 (18:06 +0000)]
Merge "MessageQueue: explicitly remove FD event listeners."
Elliott Hughes [Fri, 23 Mar 2018 18:06:36 +0000 (11:06 -0700)]
Remove non-tombstoned ANR path.
Bug: http://b/
73140330
Test: boots with ANR
Change-Id: Ib58724a0a6b831c05cb59d053520a4169ea591fd
Merged-In: Ib58724a0a6b831c05cb59d053520a4169ea591fd
Brad Ebinger [Wed, 28 Mar 2018 16:59:41 +0000 (16:59 +0000)]
Merge "Parse SMS locally upon error to get message ref"
Treehugger Robot [Wed, 28 Mar 2018 16:57:30 +0000 (16:57 +0000)]
Merge "Use commas to separate API exemptions list, not colon."
Nathan Harold [Wed, 28 Mar 2018 15:52:51 +0000 (08:52 -0700)]
Disallow Reserved SPI Allocation
Disallow the allocation of SPIs in the range
reserved for future use by RFC 4303.
Bug:
77205120
Test: runtest frameworks-net
Change-Id: I05e26ed34b5871f1a07d5bd7b58b79a64cd74b67
Mathew Inwood [Wed, 28 Mar 2018 12:01:37 +0000 (13:01 +0100)]
Use commas to separate API exemptions list, not colon.
A colon appears in the type signature of a field, so is not safe to use in
this context.
Test: m
Test: $ adb shell settings put global hidden_api_blacklist_exemptions \
Test: > Landroid/app/Activity;->mResumed:Z,Landroid/view/RemoteAnimationDefinition\\\;
Bug:
73337509
Change-Id: Ia9171fecc9c3ed265b87921b31458de25304486e
Lorenzo Colitti [Wed, 28 Mar 2018 09:17:41 +0000 (09:17 +0000)]
Merge "Allow third party cookies in the captive portal login app."
Holly Jiuyu Sun [Fri, 16 Mar 2018 01:06:42 +0000 (18:06 -0700)]
Address comments from API Review.
Bug:
74975825
Bug:
74976716
Bug:
74976875
Test: test on phone
Merged-In: I5417e5dd95c75fd3fd9fa98d7559511bd0fcd8a0
Change-Id: I5417e5dd95c75fd3fd9fa98d7559511bd0fcd8a0
Remi NGUYEN VAN [Tue, 27 Feb 2018 07:47:22 +0000 (16:47 +0900)]
Fix network usage stats on 464xlat tethered.
Usage stats corrections for 464xlat in NetworkStatsFactory are not applied
to tethered traffic. Add adjustments in NetworkStatsService. After
migrating external callers off NetworkStatsFactory, we will be able to
only apply adjustments in NetworkStatsService and remove stacked
interface tracking from NetworkStatsFactory.
Bug:
72107146
Fixes:
72107146
Test: runtest frameworks-net & manual - checked corrected network usage
Change-Id: I5ce450e616b4fddf21f2a491fe5d0c9e9f969bda
Andreas Gampe [Wed, 28 Mar 2018 02:53:57 +0000 (02:53 +0000)]
Merge "BgDexopt: Reschedule job on timeout"
Benedict Wong [Tue, 27 Mar 2018 23:55:48 +0000 (16:55 -0700)]
Clarify UDP encapsulation socket API
This change updates the getSocket() methods for IPsec to improve clarity
of the return types, both for public APIs, and internal-only methods.
Bug:
72473753
Test: APIs updated, CTS + unit tests ran.
Change-Id: I0afebd432c5d04c47c93daa1ce616d712aa323d7
Malcolm Chen [Sat, 24 Mar 2018 01:45:42 +0000 (18:45 -0700)]
Clean new TelephonyManager API.
This is to apply API council's review opinion on a previous commit.
We are reverting previous change, which renamed isDataEnabled and
setDataEnabled to isUserMobileDataEnabled and setUserMobileDataEnabled.
So this commit will remove the new APIs isUserMobileDataEnabled and
setUserMobileDataEnabled, and also rename hidden API isMobileDataEnabled
to isDataCapable.
Bug:
71584593
Test: unittest
Change-Id: I84d65776874e7a7f6e3a9af9ff7ec7dcbd715c2c
Treehugger Robot [Tue, 27 Mar 2018 22:45:18 +0000 (22:45 +0000)]
Merge changes I70eafe03,Ia44e16c5
* changes:
Hearing Aid Profile: set and get activeDevice
Move the setActiveDevice logic from Settings to SettingsLib (1/2)
Benedict Wong [Tue, 27 Mar 2018 22:19:37 +0000 (22:19 +0000)]
Merge "Add documentation for TCP interactions with transforms"
Andreas Gampe [Tue, 27 Mar 2018 22:04:19 +0000 (15:04 -0700)]
BgDexopt: Reschedule job on timeout
When the background dexopt job times out, tell the scheduler to
reschedule it, as we have more work to do.
Bug:
76425903
Test: m
Test: manual
Change-Id: Ibbdb979bceb1ff0a25f8aed2b3cc26a7f30057e2
Lorenzo Colitti [Sun, 25 Mar 2018 16:32:33 +0000 (01:32 +0900)]
Allow third party cookies in the captive portal login app.
Fix:
73909651
Test: Captive portal login app still works
Change-Id: I3ffda92e7d764ea9957df1a5408839cf10a26be5
Merged-In: I0174124cad9c108a26594b0ddd6162ca3ea6e68d
(cherry picked from commit
c3c95bab8ec7f3ef4e7649b5d24ea6525a407c44)
Brad Ebinger [Mon, 19 Mar 2018 21:30:32 +0000 (14:30 -0700)]
Parse SMS locally upon error to get message ref
Parse the SMS locally to get the message ref when
onSmsReceived fails due to the platform being
unavailable. This allows the correct message ref
to be sent back via acknowledgeSms, instead of
the incorrect "0" value.
Bug:
74551838
Test: Manual
Merged-In: I3b75da909f1f07125c5696f7f9e525736732f3c1
Change-Id: I2f8128d8ff4e07bb3720a344cee70fa5fd5d7535
Eric Schwarzenbach [Tue, 27 Mar 2018 20:59:20 +0000 (20:59 +0000)]
Merge "Add constants for reporting criteria"
Treehugger Robot [Tue, 27 Mar 2018 20:49:45 +0000 (20:49 +0000)]
Merge "Configurable hidden API exemptions."
Treehugger Robot [Tue, 27 Mar 2018 18:30:12 +0000 (18:30 +0000)]
Merge "Tell the user to toggle Bluetooth when enabling HCI logs"
Myles Watson [Mon, 26 Mar 2018 21:28:46 +0000 (14:28 -0700)]
Tell the user to toggle Bluetooth when enabling HCI logs
Bug:
67634644
Test: Manually inspect the new text in developer settings
Change-Id: Ic8b08c8d6d0c7727a03a265fb6b10a3c55fd96cb
Remi NGUYEN VAN [Tue, 27 Mar 2018 10:17:44 +0000 (10:17 +0000)]
Merge "Add tests for IPv4 of dual stack tethering."
Mathew Inwood [Fri, 16 Mar 2018 14:26:08 +0000 (14:26 +0000)]
Configurable hidden API exemptions.
Extend the existing hidden_api_blacklist_exemptions config to support a
list of API signature prefixes to exclude from hidden API enforcement.
Push this list down to the zygote process when that process is created,
and when the list changes. This minimizes overhead, but should also ensure
that all new processes get the latest whitelist.
Test: $ adb shell settings put global hidden_api_blacklist_exemptions \
Test: Landroid/view/RemoteAnimationDefinition\\\;:Landroid/app/ActivityManager\\\$TaskDescription\\\;
Test: Manually verify logcat output from app which uses named APIs
Bug:
73337509
Change-Id: Ib1245b69da4dac50c6968f1be62f1a74591dc433
Treehugger Robot [Tue, 27 Mar 2018 04:40:40 +0000 (04:40 +0000)]
Merge "Modify Open Mobile API to follow Android API guidelines"
Treehugger Robot [Mon, 26 Mar 2018 23:53:40 +0000 (23:53 +0000)]
Merge "Split the DownloadStateCallback class into two"
Ruchi Kandoi [Thu, 22 Mar 2018 18:06:36 +0000 (11:06 -0700)]
Modify Open Mobile API to follow Android API guidelines
- Add @Nullable/@NonNull to input arguments for APIs
- Remove deprecated methods openBasicChannel(aid) and
openLogicalChannel(aid)
- SecureElementListener is converted to a stand-alone interface
- serviceConnected() callback is renamed to onServiceConnected()
Bug:
64994044
Test: Run Cts Test
Change-Id: I503044a26a81dae8befb87fb8e8ac96d19de883b
Hall Liu [Tue, 20 Mar 2018 01:12:23 +0000 (18:12 -0700)]
Split the DownloadStateCallback class into two
Use individually-registered DownloadStatusListener and
DownloadProgressListener instead to listen for download status and
progress, respectively.
Bug:
74409377
Test: cts
Change-Id: Ifd5289038ffd66eef8bd7916f5256205b49be5f9
Merged-In: Ifd5289038ffd66eef8bd7916f5256205b49be5f9
Tyler Gunn [Mon, 26 Mar 2018 21:18:54 +0000 (21:18 +0000)]
Merge "Add exception catching for BlockedNumberContract methods used by Telecom."
Greg Kaiser [Mon, 26 Mar 2018 21:01:38 +0000 (14:01 -0700)]
tools/bit: Avoid leak in error condition
In the unlikely event of fread() failing, we want to avoid leaking
our buffer or the file handle.
Test: Treehugger
Change-Id: I1866d00c74ad38af4559d747fee696a60464c9f0
Martijn Coenen [Mon, 26 Mar 2018 19:00:57 +0000 (19:00 +0000)]
Merge "Add new trace tag for AIDL."
Benedict Wong [Thu, 15 Mar 2018 02:01:14 +0000 (19:01 -0700)]
Add documentation for TCP interactions with transforms
Updates API documentation to mention that TCP sockets where transforms
are deactivated will not send FIN packets.
Bug:
74851550
Test: API updates only
Change-Id: I8169f221c8c747538a8bddfbf02dcc73c9337189
Treehugger Robot [Mon, 26 Mar 2018 16:28:58 +0000 (16:28 +0000)]
Merge "Better javadoc and rename several methods in ApnSetting."
yuemingw [Wed, 21 Mar 2018 15:20:43 +0000 (15:20 +0000)]
Better javadoc and rename several methods in ApnSetting.
Cherrypicked from ag/
3709855.
Test: Manually by TestDpc
Bug:
73087996
Merged-In: I5232c92a44ab505946956f81965a205f170aa52b
Martijn Coenen [Fri, 9 Mar 2018 08:26:54 +0000 (09:26 +0100)]
Add new trace tag for AIDL.
So we can auto-generate tracing code for AIDL interfaces.
Bug:
74416314
Test: inspect atrace output
Change-Id: I42eee24358763305d6b4e954087f3331ad20f9b7
Merged-In: I42eee24358763305d6b4e954087f3331ad20f9b7
Remi NGUYEN VAN [Thu, 15 Mar 2018 02:57:14 +0000 (11:57 +0900)]
Add tests for IPv4 of dual stack tethering.
Also refactoring some Tethering and TetherInterfaceStateMachine calls
to address testability issues.
This is in preparation of other work to have IPv6-only or 464xlat
tethering working.
Test: runtest frameworks-net
Bug:
38218697
Bug:
64382985
Bug:
64976379
Bug:
64995262
Change-Id: I721aca4789ddfbee5a97316aae0b378d79ee2107
Treehugger Robot [Fri, 23 Mar 2018 23:41:11 +0000 (23:41 +0000)]
Merge "Pass all relevant resolver info to netd"
Tyler Gunn [Fri, 23 Mar 2018 17:16:15 +0000 (10:16 -0700)]
Add exception catching for BlockedNumberContract methods used by Telecom.
The content resolver can throw in some instances when using the blocked
number provider. Rather than crashing all of telecom, adding exception
handling to provide graceful fallback in these cases.
Test: Compile / build
Bug:
74965829
Change-Id: I2e1accce3ed6fac4ec2b8e6a92585abf630b84fe
Treehugger Robot [Fri, 23 Mar 2018 21:06:45 +0000 (21:06 +0000)]
Merge "Change null behavior of getCellBandwidths"
Elliott Hughes [Fri, 23 Mar 2018 19:51:59 +0000 (19:51 +0000)]
Merge "Use ABI_STRING."
Hansong Zhang [Fri, 16 Mar 2018 16:15:48 +0000 (09:15 -0700)]
Hearing Aid Profile: set and get activeDevice
Add setActiveDevice() for Hearing Aid Profile in SettingsLib
Bug:
69623109
Test: robolectric test and manual test
Change-Id: I70eafe030747053876e2ab8a125d5dd01c5e0eb9
Merged-In: I70eafe030747053876e2ab8a125d5dd01c5e0eb9
(cherry picked from commit
d7b359165968199e034bd46ca97526dbf719602d)
Hansong Zhang [Tue, 20 Mar 2018 01:20:38 +0000 (18:20 -0700)]
Move the setActiveDevice logic from Settings to SettingsLib (1/2)
Currently the Settings app handles the logic of setting active device;
however, this should be handled by SettingsLib so the logic can be shared.
Bug:
75984255
Test: robolectric test
Change-Id: Ia44e16c550d5b57c985e29e46e17044a895b495a
Merged-In: Ia44e16c550d5b57c985e29e46e17044a895b495a
(cherry picked from commit
6a416327e5b52d6bb78202bd05a86ab84cf2304e)
Eric Schwarzenbach [Thu, 22 Mar 2018 20:49:25 +0000 (13:49 -0700)]
Change null behavior of getCellBandwidths
Returns empty array instead of null when there are
no cell bandwidths.
Bug:
73751023
Test: make, runtest
Change-Id: Idc3f034bbea8f6c3f11dcd125f760b121d2c91d9
Merged-In: Idc3f034bbea8f6c3f11dcd125f760b121d2c91d9
(cherry picked from commit
c119a863501cc21bfe4853ad46987a2021041e2b)
Elliott Hughes [Fri, 23 Mar 2018 18:27:04 +0000 (11:27 -0700)]
Use ABI_STRING.
Bug: N/A
Test: builds
Change-Id: I5a9d2a6604887f1f0e9583086e012a086042b7df
Eric Schwarzenbach [Wed, 14 Feb 2018 01:45:27 +0000 (17:45 -0800)]
Add constants for reporting criteria
Adds RILConstants and TelephonyManager constants for reporting and
setting indication filter bits.
Bug:
72117365
Test: make
Change-Id: Ia52ffdbc9ea2499893ece518aba4a99c6fe4ee90
Elliott Hughes [Fri, 23 Mar 2018 17:36:23 +0000 (17:36 +0000)]
Merge "Prune files from /data/anr/ by number as well as age."
Treehugger Robot [Fri, 23 Mar 2018 17:29:36 +0000 (17:29 +0000)]
Merge "Revert "Revert "Logging: Bluetooth Enabled"""
Mathew Inwood [Fri, 23 Mar 2018 13:29:03 +0000 (13:29 +0000)]
Merge "More flexible API enforcement policy."
Mathew Inwood [Fri, 23 Mar 2018 10:05:01 +0000 (10:05 +0000)]
More flexible API enforcement policy.
This CL adds the basics to set black, dark gray or light gray list
enforcement, rather than just black as before. It's not possible to
actually set the policy per-package yet.
PackageDexOptimizer still uses a single bit, for API checks on/off, rather
than the new enum. It assumes blacklist enforcement internally. This can
be improved in a follow up CL.
(cherry-picked from commit
e52130ae4cf3b046b38a09fc7cc7712f5b7fb83d)
Test: m
Test: Boot device
BUG:
73337509
Change-Id: Ic0d5b8fa631c2bd583b6fc52b2ee3708c8113f59
Merged-In: Idd73c9938592c5c4d67cfb9efefdffed0dd5f262
David Srbecky [Fri, 23 Mar 2018 10:50:32 +0000 (10:50 +0000)]
Merge "Fix mini-debug-info generation for apps with wrap.sh script."