OSDN Git Service
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"
Treehugger Robot [Sat, 31 Mar 2018 00:16:42 +0000 (00:16 +0000)]
Merge "Update Bluetooth codec related strings"
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."
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
Holly Jiuyu Sun [Thu, 29 Mar 2018 01:22:38 +0000 (01:22 +0000)]
Merge "Address comments from API Review."
am:
18e47b6108
Change-Id: I3a4c1a0592df3b3c4f7625553bc9b92296da5c73
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
Elliott Hughes [Wed, 28 Mar 2018 23:03:55 +0000 (23:03 +0000)]
Merge "Remove non-tombstoned ANR path."
am:
ff95c80198
Change-Id: Ifdf565635e1707822794d88db7117ca5ac986d1d
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."
Malcolm Chen [Wed, 28 Mar 2018 20:47:45 +0000 (20:47 +0000)]
Merge "Clean new TelephonyManager API."
am:
8d8921d7fc
Change-Id: I6a6ffe87a6b19f5723da955308ec39c83ed5aca3
David Pursell [Wed, 28 Mar 2018 20:43:07 +0000 (20:43 +0000)]
Merge "MessageQueue: explicitly remove FD event listeners."
am:
b43daf5f7b
Change-Id: Ia6d04879f1007344d58ce9b9dbc5b1aeeafb1db7
Brad Ebinger [Wed, 28 Mar 2018 20:40:37 +0000 (20:40 +0000)]
Merge "Parse SMS locally upon error to get message ref"
am:
7a5653599c
Change-Id: I95d354c130697849e6a7953fdf4f089c557f5a4e
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."
Mathew Inwood [Wed, 28 Mar 2018 18:38:48 +0000 (18:38 +0000)]
Merge "Use commas to separate API exemptions list, not colon."
am:
2fddfcdced
Change-Id: I8435589ca414dec8ac7a857f6639b8d39fa18d98
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 10:34:30 +0000 (10:34 +0000)]
Merge "Allow third party cookies in the captive portal login app."
am:
be6d45fe92
Change-Id: I5cb87e87aa64aebebfd9969dfb1ddbf02418b174
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
Andreas Gampe [Wed, 28 Mar 2018 04:11:57 +0000 (04:11 +0000)]
Merge "BgDexopt: Reschedule job on timeout"
am:
45bd60b4e2
Change-Id: Ibe4e54f2f3ab0a7b1db3396cb1928a16b084f262
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
Hansong Zhang [Wed, 28 Mar 2018 01:20:03 +0000 (01:20 +0000)]
Merge changes I70eafe03,Ia44e16c5
am:
b52f49153c
Change-Id: I58da92a4ad77166f68a0aaec6f3fcc4ceeefc3f9
Benedict Wong [Wed, 28 Mar 2018 01:15:22 +0000 (01:15 +0000)]
Merge "Add documentation for TCP interactions with transforms"
am:
b454937f06
Change-Id: I2733218b5b3489902f80b694a1dd6b0d4c1198da
Eric Schwarzenbach [Tue, 27 Mar 2018 23:02:53 +0000 (23:02 +0000)]
Merge "Add constants for reporting criteria"
am:
a36ada4b95
Change-Id: Ib928d0de3e7e33a5efec3b5d5fe6e99f2782058d
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"
Mathew Inwood [Tue, 27 Mar 2018 22:05:14 +0000 (22:05 +0000)]
Merge "Configurable hidden API exemptions."
am:
4b8285b907
Change-Id: Ia61896bdedff170d75715094ce87b97dc96994ed
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."
Myles Watson [Tue, 27 Mar 2018 19:56:36 +0000 (19:56 +0000)]
Merge "Tell the user to toggle Bluetooth when enabling HCI logs"
am:
5b36567b76
Change-Id: Ia4a564d9117915103a96a0ce0894b35cae0ff730