OSDN Git Service
Arthur Hsu [Thu, 18 Jan 2018 21:19:41 +0000 (21:19 +0000)]
Merge "Add config_supportBluetoothPersistedState." am:
524fe66549
am:
171b8f366a
Change-Id: If1f43a76c6ade2dd2ba82f0057aa528d4624981c
Arthur Hsu [Thu, 18 Jan 2018 21:12:08 +0000 (21:12 +0000)]
Merge "Add config_supportBluetoothPersistedState."
am:
524fe66549
Change-Id: I17c56fa8a5b5a984e26591d1e0e830a1c54fa28e
Arthur Hsu [Thu, 18 Jan 2018 19:38:32 +0000 (19:38 +0000)]
Merge "Add config_supportBluetoothPersistedState."
Arthur Hsu [Thu, 11 Jan 2018 19:05:11 +0000 (11:05 -0800)]
Add config_supportBluetoothPersistedState.
Add a config to indicate whether a device supports Bluetooth persisted
state and defaulted to true. In ARC++, Bluetooth adapter state can be
out-of-sync from its container if the user changes it before the
container being available.
When set to false, this config prevents Android to auto start the
Bluetooth. ARC++ will set this to false and sync Bluetooth state later
with Android.
Related CL is ag/931281
Bug:
62413625,
69965109
Test: On sailfish, Bluetooth on/off correctly and state persisted across reboot
Change-Id: Ie298929eb6b882108a12e8b95f61e3c9f8eb63ea
Stanley Tng [Thu, 18 Jan 2018 18:08:37 +0000 (18:08 +0000)]
Merge "Added APIs for Connection-oriented channels" am:
e1992384e0
am:
288915bedc
Change-Id: Iaf2aa40e8e6e2621c146fcabe0f46c3dd1bfedc4
Stanley Tng [Thu, 18 Jan 2018 17:59:19 +0000 (17:59 +0000)]
Merge "Added APIs for Connection-oriented channels"
am:
e1992384e0
Change-Id: If7cb99a59aee8640f6dddd96f2388e2a5284df45
Treehugger Robot [Thu, 18 Jan 2018 16:42:33 +0000 (16:42 +0000)]
Merge "Added APIs for Connection-oriented channels"
Neil Fuller [Thu, 18 Jan 2018 10:31:35 +0000 (10:31 +0000)]
Merge "Javadoc fixes to Time" am:
b3c2efc615
am:
b51c638a6c
Change-Id: Ifea3eb9d25754155681b1f74096eacac1fa0b259
Neil Fuller [Thu, 18 Jan 2018 10:26:13 +0000 (10:26 +0000)]
Merge "Javadoc fixes to Time"
am:
b3c2efc615
Change-Id: I9793670f518d15fc42caa01a519c33e451998a77
Neil Fuller [Thu, 18 Jan 2018 09:18:27 +0000 (09:18 +0000)]
Merge "Javadoc fixes to Time"
Holly Jiuyu Sun [Thu, 18 Jan 2018 04:14:54 +0000 (04:14 +0000)]
Merge "Add APIs to EuiccCardManager." am:
a5bc474e2c
am:
f07319a6df
Change-Id: I71b5ea764f306a8a852f08a99f6a7247109e3511
Jeff Sharkey [Thu, 18 Jan 2018 04:10:00 +0000 (04:10 +0000)]
Merge "Add "not congested" network capability." am:
ffaddf73de
am:
abb158f712
Change-Id: I2c7276bd657f5805c0b6492a216435270023a3c6
Erik Kline [Thu, 18 Jan 2018 04:02:46 +0000 (04:02 +0000)]
Merge "Add basic resolution of Private DNS hostname" am:
a3bf36f050
am:
4218c522a7
Change-Id: Ifc776c67025925fbeb2c13038ae78061c32567f5
Holly Jiuyu Sun [Thu, 18 Jan 2018 04:01:59 +0000 (04:01 +0000)]
Merge "Add APIs to EuiccCardManager."
am:
a5bc474e2c
Change-Id: Ib0653ef73bb59f5dba2396bde20d1f29b107da86
Jeff Sharkey [Thu, 18 Jan 2018 03:58:13 +0000 (03:58 +0000)]
Merge "Add "not congested" network capability."
am:
ffaddf73de
Change-Id: I02ea25610df63b40547c3114c0f9a9ef59560e90
Erik Kline [Thu, 18 Jan 2018 03:54:50 +0000 (03:54 +0000)]
Merge "Add basic resolution of Private DNS hostname"
am:
a3bf36f050
Change-Id: I9ce3476d80b05c140a02aaf1c21d4da2a68a8909
Holly Jiuyu Sun [Thu, 18 Jan 2018 03:32:22 +0000 (03:32 +0000)]
Merge "Add APIs to EuiccCardManager."
Jeff Sharkey [Thu, 18 Jan 2018 03:28:34 +0000 (03:28 +0000)]
Merge "Add "not congested" network capability."
Lorenzo Colitti [Thu, 18 Jan 2018 03:27:51 +0000 (03:27 +0000)]
Merge "Add public API methods for private DNS." am:
aacb56a7c0
am:
f193c6d37d
Change-Id: I8d5a5b72c128231cca1dfb00bc00e887b5fbfc53
Lorenzo Colitti [Thu, 18 Jan 2018 03:21:02 +0000 (03:21 +0000)]
Merge "Add public API methods for private DNS."
am:
aacb56a7c0
Change-Id: If2bdfb05fcb235888bf272e4cfddb14619fc3f78
Treehugger Robot [Thu, 18 Jan 2018 02:44:53 +0000 (02:44 +0000)]
Merge "Add basic resolution of Private DNS hostname"
Pavlin Radoslavov [Thu, 18 Jan 2018 02:18:03 +0000 (02:18 +0000)]
Merge "Added internal API getMaxConnectedAudioDevices()" am:
877cbe1dc2
am:
18606e1601
Change-Id: I58199a6c70bfa03fc515c573b936c78ec34d61ac
Pavlin Radoslavov [Thu, 18 Jan 2018 02:10:31 +0000 (02:10 +0000)]
Merge "Added internal API getMaxConnectedAudioDevices()"
am:
877cbe1dc2
Change-Id: Ifb7b28f3993e3d8967886bdff006bcd2679d3277
Victor Hsieh [Thu, 18 Jan 2018 01:23:32 +0000 (01:23 +0000)]
Merge "Reland: Move zygote's seccomp setup to post-fork" am:
7839672e22
am:
4249466562
Change-Id: Idbf4d7add5e41d2d01f4a3c2ff6e8f1b1735faeb
Lorenzo Colitti [Thu, 18 Jan 2018 01:17:17 +0000 (01:17 +0000)]
Merge "Add public API methods for private DNS."
Victor Hsieh [Thu, 18 Jan 2018 01:15:05 +0000 (01:15 +0000)]
Merge "Reland: Move zygote's seccomp setup to post-fork"
am:
7839672e22
Change-Id: I93275a50938ed1514fc690fe2e1390054748d361
Joseph Pirozzo [Thu, 18 Jan 2018 01:09:30 +0000 (01:09 +0000)]
Merge "Bluetooth in band ring" am:
dbfaf31357
am:
8c73ee91f5
Change-Id: I1972da1da7bc0c001dc4525858bdb0e8bd5dd530
Joseph Pirozzo [Thu, 18 Jan 2018 01:02:14 +0000 (01:02 +0000)]
Merge "Bluetooth in band ring"
am:
dbfaf31357
Change-Id: I24b9169afc67e376a22c99f8a1ae7117549401f8
Treehugger Robot [Thu, 18 Jan 2018 00:46:57 +0000 (00:46 +0000)]
Merge "Added internal API getMaxConnectedAudioDevices()"
Holly Jiuyu Sun [Fri, 22 Dec 2017 02:44:59 +0000 (18:44 -0800)]
Add APIs to EuiccCardManager.
The CL contains parts of the EuiccCard APIs. getEid() is sync. All the
other APIs are async.
Move ResetOptions from EuiccCard to EuiccCardManager.
The other APIs will be added in a follow-up CL.
Bug:
38206971
Test: test on phone
Change-Id: Iba098ee779b8ea4e244e0e4cf7318139666cc94b
Andy Hung [Thu, 18 Jan 2018 00:02:14 +0000 (00:02 +0000)]
Merge "Watchdog: add media.metrics" am:
6cb33a1b54
am:
701c4cd1cc
Change-Id: If5fb8cfe18e7fad089b5aec8e3168dab940826ec
Treehugger Robot [Wed, 17 Jan 2018 23:58:10 +0000 (23:58 +0000)]
Merge "Reland: Move zygote's seccomp setup to post-fork"
Andy Hung [Wed, 17 Jan 2018 23:55:25 +0000 (23:55 +0000)]
Merge "Watchdog: add media.metrics"
am:
6cb33a1b54
Change-Id: I24992a0a7e4e4a67fba1c5202fc4e741a3952794
Treehugger Robot [Wed, 17 Jan 2018 23:48:40 +0000 (23:48 +0000)]
Merge "Bluetooth in band ring"
Holly Jiuyu Sun [Wed, 17 Jan 2018 23:25:13 +0000 (23:25 +0000)]
Merge "Add APIs to EuiccCardManager and EuiccCardController." am:
0797f4be58
am:
f09db036e5
Change-Id: Ifcd39da6aafb4cd1e0b6e9e1baa38342a590fb91
Jack Yu [Wed, 17 Jan 2018 23:18:21 +0000 (23:18 +0000)]
Merge "Added data service interface" am:
3965e3bbc6
am:
5f12e2c76d
Change-Id: Iac4b6e1b86cdfa2e3285a086220b7c7aa921d7ff
Brad Ebinger [Wed, 17 Jan 2018 23:13:46 +0000 (23:13 +0000)]
Merge "Integrate IMS Registration API" am:
1f00565433
am:
f4d3a4d110
Change-Id: I19e812368d0afd5bd7934b4e3a2aa575d0c1d3a3
Holly Jiuyu Sun [Wed, 17 Jan 2018 23:07:54 +0000 (23:07 +0000)]
Merge "Add APIs to EuiccCardManager and EuiccCardController."
am:
0797f4be58
Change-Id: Ie96bf09b698718705971bd94cd44f55e74700223
yuemingw [Wed, 17 Jan 2018 23:05:16 +0000 (23:05 +0000)]
Merge "Add URL_DPC, URL_FILTERED and URL_ENFORCE_MANAGED as constants." am:
b760295764
am:
10f60a740f
Change-Id: I7e00f153a147c906fe853c1f98e492a0c381850a
Jack Yu [Wed, 17 Jan 2018 23:04:57 +0000 (23:04 +0000)]
Merge "Added data service interface"
am:
3965e3bbc6
Change-Id: I7543aff2abadb4c6b2556f37cd5e763cb5a8c08c
Brad Ebinger [Wed, 17 Jan 2018 23:01:03 +0000 (23:01 +0000)]
Merge "Integrate IMS Registration API"
am:
1f00565433
Change-Id: I1bbbdbe612a154c9d13dd5d162e2149d3f94a958
yuemingw [Wed, 17 Jan 2018 22:57:50 +0000 (22:57 +0000)]
Merge "Add URL_DPC, URL_FILTERED and URL_ENFORCE_MANAGED as constants."
am:
b760295764
Change-Id: Ib7ff0f0854c164eb5044649a63bb113ec473609c
Andy Hung [Wed, 17 Jan 2018 22:33:53 +0000 (22:33 +0000)]
Merge "Watchdog: add media.metrics"
Holly Jiuyu Sun [Wed, 17 Jan 2018 22:26:58 +0000 (22:26 +0000)]
Merge "Add APIs to EuiccCardManager and EuiccCardController."
Jack Yu [Wed, 17 Jan 2018 22:12:29 +0000 (22:12 +0000)]
Merge "Added data service interface"
jackqdyulei [Wed, 17 Jan 2018 21:21:57 +0000 (21:21 +0000)]
Merge "Add metric for anomaly detection" into oc-mr1-dev
am:
9b1211b353 -s ours
Change-Id: I1c7830ed2c956ed22682e7d0d03860f5fa7c7886
Neil Fuller [Wed, 17 Jan 2018 21:13:21 +0000 (21:13 +0000)]
Javadoc fixes to Time
Fixing errors noticed while inspecting the code.
Test: None - docs only
Change-Id: Ib6d427c4339f0b8e56eb72b12e89c1095245d6b4
Chen Xu [Wed, 17 Jan 2018 20:49:04 +0000 (20:49 +0000)]
Merge "new carrier id APIs" am:
3d23b90874
am:
7537309843
Change-Id: I8b64968ddb59304543eee89eb1e2dcb4d66517e3
dalyk [Wed, 17 Jan 2018 19:20:55 +0000 (14:20 -0500)]
Add public API methods for private DNS.
Test: Small modifications to LinkProperties test.
Bug:
71828272
Change-Id: Id2f5acb5469132ec4a917837739f42085c71498e
nharold [Wed, 17 Jan 2018 20:39:29 +0000 (20:39 +0000)]
Merge "IpSec - API Tweak for removeTransportModeTransform" am:
6725ff729b
am:
d58b237445
Change-Id: Id9e9ab09669a53f53f03e5a6e0e4757434c3f3f3
Chen Xu [Wed, 17 Jan 2018 20:38:27 +0000 (20:38 +0000)]
Merge "new carrier id APIs"
am:
3d23b90874
Change-Id: Ifaa9e4e2f4ec3ef9703c4bf58e8452a9920b350a
TreeHugger Robot [Wed, 17 Jan 2018 20:36:06 +0000 (20:36 +0000)]
Merge "Add metric for anomaly detection" into oc-mr1-dev
nharold [Wed, 17 Jan 2018 20:31:15 +0000 (20:31 +0000)]
Merge "IpSec - API Tweak for removeTransportModeTransform"
am:
6725ff729b
Change-Id: I0ed7128014bbca8973f84d719449dcf70da45fa2
Brad Ebinger [Wed, 17 Jan 2018 20:29:54 +0000 (20:29 +0000)]
Merge "Integrate IMS Registration API"
Treehugger Robot [Wed, 17 Jan 2018 19:50:40 +0000 (19:50 +0000)]
Merge "Add URL_DPC, URL_FILTERED and URL_ENFORCE_MANAGED as constants."
Arthur Hsu [Wed, 17 Jan 2018 19:21:39 +0000 (19:21 +0000)]
Merge "Skip SystemUI check in BluetoothServiceManager if noHome." am:
fc3b50e9b6
am:
65d0549fde
Change-Id: Ia42f33a0d7becd5a4f3f3f81fc077d13863f94ed
Arthur Hsu [Wed, 17 Jan 2018 19:15:47 +0000 (19:15 +0000)]
Merge "Skip SystemUI check in BluetoothServiceManager if noHome."
am:
fc3b50e9b6
Change-Id: Icf53fb7a223e64a3f73cea475fb0a522b3f96ece
Chen Xu [Wed, 17 Jan 2018 19:09:34 +0000 (19:09 +0000)]
Merge "new carrier id APIs"
nharold [Wed, 17 Jan 2018 19:07:10 +0000 (19:07 +0000)]
Merge "IpSec - API Tweak for removeTransportModeTransform"
Holly Jiuyu Sun [Fri, 22 Dec 2017 02:44:59 +0000 (18:44 -0800)]
Add APIs to EuiccCardManager and EuiccCardController.
Move CancelReason from EuiccCard to EuiccCardManager.
part 2.
Bug:
38206971
Test: test on phone
Change-Id: Iab61be59b7130a5336dffbc965eefefcfa3eccf6
Jack Yu [Tue, 28 Nov 2017 01:36:29 +0000 (17:36 -0800)]
Added data service interface
The interface for mobile data service. This is the base class
for vendor or first party data service provider to implement
the data service for cellular or IWLAN data support.
Test: Manual
bug:
64132030
Change-Id: I3e5f48b88905f4533cac60975802d4da3746e7f8
Treehugger Robot [Wed, 17 Jan 2018 17:33:41 +0000 (17:33 +0000)]
Merge "Skip SystemUI check in BluetoothServiceManager if noHome."
Victor Hsieh [Mon, 8 Jan 2018 20:43:00 +0000 (12:43 -0800)]
Reland: Move zygote's seccomp setup to post-fork
Before this change, seccomp filter setup is as early as in zygote's main
function. To make it possible to split app and system server's filter,
this postpone the setup to after fork. It also starts to call app
specific and system server specific setup function.
The filter setup is done in Zygote's ForkAndSpecializeCommon. This is
because adding a seccomp filter must be done when either the caller has
CAP_SYS_ADMIN or after the PR_SET_NO_NEW_PRIVS bit is set. Given that
setting PR_SET_NO_NEW_PRIVS breaks SELinux domain transition
(b/
71859146), this must be done after Zygote forks but before
CAP_SYS_ADMIN is droppped.
Test: (cts) -m CtsSecurityTestCases -t android.security.cts.SeccompTest
Test: no selinux denial flood in dmesg with selinux enforced
Test: debuggerd -b `pidof com.android.phone` # logcat shows tombstoned
received crash request
Bug:
63944145
Bug:
71859146
Change-Id: I8215c8530d3d0de504a270488f8e29635805e8b0
fionaxu [Tue, 28 Nov 2017 06:53:42 +0000 (22:53 -0800)]
new carrier id APIs
1. New telephony APIs to getCurrentCarrierId
and getCurrentCarrierName
2. New broadcast intent to notify carrier id changed
Bug:
64131637
Test: Build
Change-Id: I9a240ba7df313ad701f98bb3982f29c3d5317da8
(cherry picked from commit
fff6f59a63304be50e7a251fb4fca38ae0090fc4)
Merged-in: I9a240ba7df313ad701f98bb3982f29c3d5317da8
David Brazdil [Wed, 17 Jan 2018 14:17:59 +0000 (14:17 +0000)]
Merge "Pass targetSdkVersion to installd" am:
106a915256
am:
77ba6baab5
Change-Id: Ic0b3323ee46e0bacffd62bd763da15e3256da783
Erik Kline [Thu, 11 Jan 2018 12:07:29 +0000 (21:07 +0900)]
Add basic resolution of Private DNS hostname
Test: as follows
- built
- flashed
- booted
Bug:
34953048
Bug:
64133961
Change-Id: I0a2289ea51a9294352c91d2ead23730d9b0333a5
David Brazdil [Wed, 17 Jan 2018 14:10:54 +0000 (14:10 +0000)]
Merge "Pass targetSdkVersion to installd"
am:
106a915256
Change-Id: If9622d593591a4a270e0bb1a16ed3a0c91d43f43
David Brazdil [Wed, 17 Jan 2018 13:42:29 +0000 (13:42 +0000)]
Merge "Pass targetSdkVersion to installd"
yuemingw [Tue, 16 Jan 2018 19:48:10 +0000 (19:48 +0000)]
Add URL_DPC, URL_FILTERED and URL_ENFORCE_MANAGED as constants.
Test: manual
Bug:
68208245
Change-Id: I9416526f4a6e014dae66a936d6d1eb60309ef8ab
Pavlin Radoslavov [Wed, 17 Jan 2018 10:09:53 +0000 (02:09 -0800)]
Added internal API getMaxConnectedAudioDevices()
The API can be used to obtain the maximum number of connected
devices for A2DP or HFP.
Test: Manual
Bug:
64767509
Change-Id: I80b8a1c85e33ae0b23fdc4812f8991a4202d9abc
nharold [Wed, 17 Jan 2018 10:02:51 +0000 (10:02 +0000)]
Merge "Prevent Closure of Underlying Socket FDs" am:
3cff120fcb
am:
31f05d66ca
Change-Id: I1ecac95dc1c4be573d5411a335f94c6a6511d4bd
nharold [Wed, 17 Jan 2018 09:53:37 +0000 (09:53 +0000)]
Merge changes from topic "ipsec-oneway-transform" am:
809bcfc45e
am:
f2074ea62a
Change-Id: I58fe595ff14e3ee6be5191171367e8a2f7fad6da
Nathan Harold [Wed, 17 Jan 2018 09:50:37 +0000 (09:50 +0000)]
Make Transforms Unidirectional am:
a25233123b
am:
f4fc2714c2
Change-Id: Ie3ca37e14d977fd255a7791ae3332ddda29ab37e
nharold [Wed, 17 Jan 2018 09:47:49 +0000 (09:47 +0000)]
Merge "Prevent Closure of Underlying Socket FDs"
am:
3cff120fcb
Change-Id: I2f8e445f9a12e95cf8d81d63e02fad7ecc17ad36
nharold [Wed, 17 Jan 2018 09:42:03 +0000 (09:42 +0000)]
Merge changes from topic "ipsec-oneway-transform"
am:
809bcfc45e
Change-Id: If98285e2bd41e2eedaf81f1ff0e5f2b2d3827f91
Nathan Harold [Wed, 17 Jan 2018 09:37:57 +0000 (09:37 +0000)]
Make Transforms Unidirectional
am:
a25233123b
Change-Id: I7e80c75b3b227fdd16479120d8b7203cc5f28d1c
Jeff Sharkey [Wed, 17 Jan 2018 04:27:03 +0000 (13:27 +0900)]
Add "not congested" network capability.
Can be used by a network to indicate when it's congested, meaning that
apps should defer network traffic that could be done at a later time.
Test: bit FrameworksNetTests:android.net.,com.android.server.net.,com.android.server.connectivity.VpnTest,com.android.server.ConnectivityServiceTest
Bug:
64133169
Change-Id: I8a60b6f02dd0f42268b59690556c16335d34e220
Nathan Harold [Wed, 17 Jan 2018 09:00:20 +0000 (01:00 -0800)]
IpSec - API Tweak for removeTransportModeTransform
Because IpSecTransforms are now unidirectional,
and because the only mechanism for removing Transforms
removes it from both directions, the API can no longer
use the Transform parameter to meaningfully validate
that the caller had applied a transform. Since that
functionality was as-yet unimplemented and is now
infeasible, the transform parameter is removed.
Bug:
72079356
Test: cts - IpSecManagerTest; runtest frameworks-net
Change-Id: If19b0d34bdc6daf31a40d6d62bff326dcbca08c0
nharold [Wed, 17 Jan 2018 08:45:29 +0000 (08:45 +0000)]
Merge "Prevent Closure of Underlying Socket FDs"
nharold [Wed, 17 Jan 2018 08:40:37 +0000 (08:40 +0000)]
Merge changes from topic "ipsec-oneway-transform"
* changes:
Update IpSecService UnitTests
Make Transforms Unidirectional
nharold [Wed, 17 Jan 2018 06:59:39 +0000 (06:59 +0000)]
Merge "Update documentation for KEY_CARRIER_NAME_STRING" am:
fa6187510a
am:
03dafac495
Change-Id: I3c0e13153a347e6ef79cfee9f00a6ee6694425d9
nharold [Wed, 17 Jan 2018 06:51:38 +0000 (06:51 +0000)]
Merge "Update documentation for KEY_CARRIER_NAME_STRING"
am:
fa6187510a
Change-Id: I50fe5f4ea30b6923e7ca5c0fe3eb62fa9db3dabf
Nathan Harold [Tue, 16 Jan 2018 20:08:43 +0000 (12:08 -0800)]
Prevent Closure of Underlying Socket FDs
The version of applyTransportModeTransform() and
removeTransportModeTransform() that accepted
Socket and DatagramSocket were closing the underlying
FDs upon return. It's unclear whether this is due to
a behavior change elsewhere in ParcelFileDescriptor,
but either way, converting to using getFileDescriptor$
and then calling dup() explicitly rather than relying
on ParcelFileDescriptor seems like a better idea anyway.
Bug:
72047396
Test: CTS - IpSecManagerTest.testCreateTransform()
Change-Id: Ia2f02564e1289f25bf113dbb861fcfd2240537a7
nharold [Wed, 17 Jan 2018 03:39:44 +0000 (03:39 +0000)]
Merge "Update documentation for KEY_CARRIER_NAME_STRING"
Nathan Harold [Wed, 17 Jan 2018 03:34:01 +0000 (19:34 -0800)]
Update IpSecService UnitTests
The IpSecService Unit tests relied on the
directionality of the IpSecConfig and previously
did not specify a source address. Unit tests
updated without functional change other than to
address these two requirements.
Bug:
71717213
Test: runtest frameworks-net
Change-Id: Iedbed735bc50fd4fdfe985f9e173956062a7b0d1
Ryan Lothian [Wed, 17 Jan 2018 01:59:09 +0000 (01:59 +0000)]
Merge "Handle onBindingDied in notification manager" am:
a13201a99b
am:
d69921cc9a
Change-Id: I91f5642cb8f2d740e8acbbb739fc42f6a2f1bc63
Ryan Lothian [Wed, 17 Jan 2018 01:51:02 +0000 (01:51 +0000)]
Merge "Handle onBindingDied in notification manager"
am:
a13201a99b
Change-Id: I01d3d65fcc6032d5de17f84cdc8eb5119aaeeadf
Android Build Merger (Role) [Tue, 16 Jan 2018 23:54:53 +0000 (23:54 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Preventing recursive referrence in drawables skipped:
cee125012a am:
9b90490d1d
am:
17ef28c5e2
Change-Id: I7e2e495eb815655db3ea365e44d069dfb6227a5a
Android Build Merger (Role) [Tue, 16 Jan 2018 23:42:30 +0000 (23:42 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Preventing recursive referrence in drawables skipped:
cee125012a am:
9b90490d1d
Change-Id: If121edaf0d2edac5688ff2aa4ed48da1d5e1c1c7
Android Build Merger (Role) [Tue, 16 Jan 2018 23:42:24 +0000 (23:42 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Preventing recursive referrence in drawables skipped:
cee125012a
Change-Id: Ie180da5d659b106e1c5299b0a46b6cbf24548ae0
Sunny Goyal [Wed, 1 Nov 2017 18:58:13 +0000 (11:58 -0700)]
RESTRICT AUTOMERGE Preventing recursive referrence in drawables
Bug:
68706673
Bug:
66498711
Test: Added CTS tests
Change-Id: I8034f49d16f9a7bc1749714fd6d6231bba5088d0
(cherry picked from commit I8034f49d16f9a7bc1749714fd6d6231bba5088d0)
Merged-In: I8034f49d16f9a7bc1749714fd6d6231bba5088d0
Ryan Lothian [Tue, 16 Jan 2018 23:31:41 +0000 (23:31 +0000)]
Merge "Handle onBindingDied in notification manager"
Ryan Lothian [Mon, 4 Dec 2017 16:56:58 +0000 (11:56 -0500)]
Handle onBindingDied in notification manager
On Android, if the process containing the service being bound to
crashes before the bind succeeds, the app doing the binding won't
get a success or failure callback.
When that happens in this code, this leaves notif. manager thinking
that a binding is in progress, so it never attempts to rebind until
the device is rebooted.
Bug:
69064494
Test: original CL was manually tested --
crashed listener on proc start, verified not unbound forever
Change-Id: Id2082744208e21a709d9453365f282449a2e9407
(cherry picked from commit
4a86a51b672617b02994fc812e4f96342daf424e)
David Brazdil [Tue, 16 Jan 2018 20:01:47 +0000 (20:01 +0000)]
Pass targetSdkVersion to installd
Dex2oat now accepts targetSdkVersion as a parameter to determine
whether ART should treat the app as "legacy" and allow or restrict
access to private APIs.
We also bump arguments of otapreopt to v4 to accommodate the new value.
Bug:
64382372
Test: manual
Change-Id: Iae3867325dfaf8deaba51626ab04b97ad797d3b6
Ivan Lozano [Tue, 16 Jan 2018 21:49:36 +0000 (21:49 +0000)]
Merge "Fix doFadingAnimationLocked in sanitized builds." am:
05284b6c6a
am:
b327eb682e
Change-Id: I109a08b8ae94cbeca28044f2c64c885a586f680a
Ivan Lozano [Tue, 16 Jan 2018 21:42:07 +0000 (21:42 +0000)]
Merge "Fix doFadingAnimationLocked in sanitized builds."
am:
05284b6c6a
Change-Id: I5822b920fe1dec72f0f49af35256bfbf6d9474fa
Ivan Lozano [Tue, 16 Jan 2018 20:27:36 +0000 (20:27 +0000)]
Merge "Fix doFadingAnimationLocked in sanitized builds."
Andreas Gampe [Tue, 16 Jan 2018 19:59:02 +0000 (19:59 +0000)]
Merge "ActivityThread: Attempt to attach agent with app's classloader" am:
f779d7e3be
am:
9f1f950c31
Change-Id: I0df113aff5a54c5a1dbc5f968679bb9d4f8ea158
Andreas Gampe [Tue, 16 Jan 2018 19:46:36 +0000 (19:46 +0000)]
Merge "ActivityThread: Attempt to attach agent with app's classloader"
am:
f779d7e3be
Change-Id: Id5ae3b90ca4b75046419fb1a6c02ef556d225f77
Nathan Harold [Sat, 6 Jan 2018 03:25:13 +0000 (19:25 -0800)]
Make Transforms Unidirectional
Convert the IpSecTransform from being a bi-directional
pair of SAs to a unidirectional single SA. This CL
also removes the concept of "direction from SAs meaning
that a IpSecTransform may now be applied to a socket
in either direction.
-Make transforms unidirectional
-Add Convert allocateSpi() to use destination rather
than direction and remote address
-Remove directionality from builders for IpSecTransform
-Change applyTransportModeTransform() to take a
direction in which to apply the transform object.
-Additional minor naming updates
-Restrict IpSecConfig to only print keys on eng builds
-Move DIRECTION constants to IpSecManager
-Add sourceAddress parameter to IpSecTransform to provide
additional guarantees about the source address of data;
(explicit failure rather than implicit failure).
-Move SPI to the build() method of IpSecTransform
Bug:
71717213
Test: runtest frameworks-net, CTS - IpSecManagerTest
Change-Id: I0824b37f443f4b8c62536d9801238c63ed8f2a1c