OSDN Git Service
Lorenzo Colitti [Mon, 22 Jan 2018 03:50:58 +0000 (12:50 +0900)]
Disable IpConnectivityMetricsTest.
This test has been failing for a while, and we are do not have
bandwidth to fix it during the next week.
Test: make -j64 FrameworksNetTests RUN_ERROR_PRONE=true
Test: atest FrameworksNetTests:IpConnectivityMetricsTest
Test: runtest -x frameworks/base/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java
Change-Id: I59d73c1773e160a726996f3ab4ad20312decc127
Merged-In: I59d73c1773e160a726996f3ab4ad20312decc127
Lorenzo Colitti [Fri, 19 Jan 2018 17:02:56 +0000 (02:02 +0900)]
Add the defaultNetwork element to the netstats.proto.
This is in its own commit because AOSP has diverged from internal
master.
Bug:
35142602
Test: builds, boots
Change-Id: I75fc85b961bc919e3d6c2adce6d6861c6f2c8379
Merged-In: I75fc85b961bc919e3d6c2adce6d6861c6f2c8379
Lorenzo Colitti [Thu, 18 Jan 2018 16:12:58 +0000 (01:12 +0900)]
Add getDefaultNetwork to the NetworkStats public API.
This allows an app using the public API to know whether the
traffic in a particular bucket was on the default network
(i.e., the network was selected by the system), or not (i.e.,
the network was selected by the app).
Bug:
35142602
Test: builds, boots
Test: added coverage to NetworkUsageStatsTest CTS test, still passes
Change-Id: I9f6669908fa119743b9c0aa0c31a03e5ebafa7db
Merged-In: I9f6669908fa119743b9c0aa0c31a03e5ebafa7db
Badhri Jagan Sridharan [Tue, 23 Jan 2018 03:09:27 +0000 (03:09 +0000)]
Merge "Add support for UsbDeviceManager to talk to USB GADGET HAL"
Badhri Jagan Sridharan [Fri, 12 Jan 2018 00:56:29 +0000 (16:56 -0800)]
Add support for UsbDeviceManager to talk to USB GADGET HAL
Till now, Init scripts(property tiggers) are used define the
operation that needs to be performed when a certain gadget
composition needs to be enabled. Based on the user preference,
usb service sets the sys.usb.config which triggers the
corresponding property triggers in init scripts and usbservice
polls on sys.usb.state to infer whether the property triggers
have completed executing.
This CL makes UsbHandler class abstract to make init scripts
based legacy implementation and HAL based implementation to
share the common logic. The legacy init script based logic is
implemented by UsbHandlerLegacy and HAL based logic is implemented
by UsbHandlerHal. The decision on which one to initialize is
made depending on whether the device has Gadget HAL impelemented.
Since HIDL supports asynch calbacks, usb state management is moved
to the message queue to avoid polling incase of HAL based
implementation.
To switch to a new configuration:
1. UsbService calls setCurrentUsbFunctions and queues
MSG_SET_FUNCTIONS_TIMEOUT
2. If the setCurrentUsbFunctionsCb arrives on time,
then MSG_SET_FUNCTIONS_TIMEOUT is cancelled and
default functions are retried by queueing
MSG_SET_DEFAULT_FUNCTIONS if SUCCESS is not signalled.
3. If MSG_SET_FUNCTIONS_TIMEOUT gets executed, then,
default functions are retried by calling
setEnabledFunctions(null, false, mUsbDataUnlocked);
Also, for HAL based implementation config_oemUsbModeOverride is no
longer needed as hal can take of enabling oem specific functions.
Bug:
63669128
Test: Tested usb gadget configuration for both cases:
1. When gadget hal is present
2. When gadget hal is not present
Change-Id: Ifcef464a0b97b265872696346a76162f8e84d6c0
Treehugger Robot [Tue, 23 Jan 2018 00:52:00 +0000 (00:52 +0000)]
Merge "Camera: remove NOT_PRESENT cameras"
Lorenzo Colitti [Tue, 23 Jan 2018 00:15:15 +0000 (00:15 +0000)]
Merge "Remove obsolete NetworkStats.Entry constructor."
Treehugger Robot [Mon, 22 Jan 2018 23:55:49 +0000 (23:55 +0000)]
Merge "Add broadcast action for carrier setup"
Treehugger Robot [Mon, 22 Jan 2018 22:53:38 +0000 (22:53 +0000)]
Merge "Add NetworkTypeBitmask into public ApnSetting."
Chen Xu [Mon, 22 Jan 2018 22:44:02 +0000 (22:44 +0000)]
Merge "address carrier id api review feedback"
Qingxi Li [Fri, 19 Jan 2018 20:24:05 +0000 (12:24 -0800)]
Add broadcast action for carrier setup
This broadcast action is sent by eSIM Manager to let the carrier app
know that the carrier setup is not completed.
Bug:
62639823
Test: TreeHugger
Merged-In: I88ac90cf679d5ec98aa7c0cf7bd9c96010597a1c
Change-Id: I88ac90cf679d5ec98aa7c0cf7bd9c96010597a1c
fionaxu [Fri, 5 Jan 2018 23:38:11 +0000 (15:38 -0800)]
address carrier id api review feedback
1. improve comments
2. change returned carrier name from String to CharSequence
3. change to AndroidCarrierId
Bug:
64131637
Bug:
71584605
Test: Manual
Change-Id: I412d53bb9d4955e1267300692e90ebfffd6818df
Merged-in: I412d53bb9d4955e1267300692e90ebfffd6818df
Benedict Wong [Mon, 22 Jan 2018 20:32:18 +0000 (20:32 +0000)]
Merge "Address comments and final cleanup from refcounting integration"
Treehugger Robot [Mon, 22 Jan 2018 18:22:07 +0000 (18:22 +0000)]
Merge "Debug: Add attachJvmtiAgent with classloader"
Benedict Wong [Mon, 22 Jan 2018 17:57:15 +0000 (17:57 +0000)]
Merge "Rename create/delete transform methods"
yuemingw [Mon, 22 Jan 2018 17:32:09 +0000 (17:32 +0000)]
Add NetworkTypeBitmask into public ApnSetting.
Sync with aosp/556766.
Moved from ag/
3477310.
Bug:
68208293
Test: manual
Change-Id: I04b901c46b7bbce4ed7d52895fcc904fb713fb69
Lorenzo Colitti [Sun, 21 Jan 2018 14:00:55 +0000 (23:00 +0900)]
Remove obsolete NetworkStats.Entry constructor.
The only caller is telephony code, and it's being fixed in this
topic.
Bug:
35142602
Test: builds, boots
Change-Id: Ia77a1c2c297037f311c2355610c206cd8e3192c4
Treehugger Robot [Sat, 20 Jan 2018 23:30:34 +0000 (23:30 +0000)]
Merge "Multi-A2DP support - add a new internal API to suppress Audio Noisy intent"
Pavlin Radoslavov [Sat, 20 Jan 2018 02:20:04 +0000 (18:20 -0800)]
Multi-A2DP support - add a new internal API to suppress Audio Noisy intent
The new API setBluetoothA2dpDeviceConnectionStateSuppressNoisyIntent()
is similar to the existing setBluetoothA2dpDeviceConnectionState()
except that it takes one extra argument that indicates whether the
AudioManager.ACTION_AUDIO_BECOMING_NOISY intent will be sent:
setBluetoothA2dpDeviceConnectionStateSuppressNoisyIntent(
..., boolean suppressNoisyIntent)
This API is needed so the Active A2DP Sink device can be changed
while audio is streaming, and the audio continues playing on the new
Active Device.
Bug:
69269748
Test: Manual: multiple connected A2DP devices, and selecting each as
the Active Device.
Change-Id: I75766a58d9e6b42b3ce68bd9ad3a7a72ca5a1023
(cherry picked from commit
82e06463f2571a06286f9da0bf3ad5a0e58461a2)
David Brazdil [Sat, 20 Jan 2018 10:06:22 +0000 (10:06 +0000)]
Merge "Generate new API signatures from doclava"
Treehugger Robot [Sat, 20 Jan 2018 08:28:24 +0000 (08:28 +0000)]
Merge "Add CARD_ID in SubscriptionInfo database"
Yin-Chia Yeh [Tue, 2 Jan 2018 19:17:58 +0000 (11:17 -0800)]
Camera: remove NOT_PRESENT cameras
So hot plug cameras won't stay forever in
device status map.
Change-Id: I0290ff2eccb3d48a0f72c48f32a97909d20623ad
Jordan Liu [Fri, 19 Jan 2018 20:39:43 +0000 (20:39 +0000)]
Merge "Make LTE signal bar thresholds customizable with carrier configuration"
nharold [Fri, 19 Jan 2018 19:43:17 +0000 (19:43 +0000)]
Merge "Add Tunnel Interface APIs to IpSecManager"
Kitta Koutarou [Fri, 1 Dec 2017 10:19:49 +0000 (19:19 +0900)]
Make LTE signal bar thresholds customizable with carrier configuration
Move config_lteDbmThresholds to KEY_LTE_RSRP_THRESHOLDS_INT_ARRAY
to control the LTE signal bar thresholds by carrier configuration.
Test: manual - Checked that the LTE signal bar thresholds can be
controlled by carrier config.
Test: auto - Confirmed that run
ServiceStateTrackerTest#testSignalStrength and it has no problem.
Bug:
70698348
Change-Id: Ia613663956ff00fbf299dcf69113733eae5a3458
Merged-In: Ia613663956ff00fbf299dcf69113733eae5a3458
Benedict Wong [Thu, 18 Jan 2018 22:38:16 +0000 (14:38 -0800)]
Rename create/delete transform methods
CreateTransportModeTransform and DeleteTransportModeTransform are both
agnostic as far as which mode of transform it creates/deletes. As such,
to facilitate the implementation of tunnel mode, this patch renames them
to CreateTransform and DeleteTransform, along with all test names.
Bug:
63588681
Test: frameworks/base unit tests and CTS tests run, passed
Change-Id: I1f015eb7ad0e85fca966658a9402485ca2b44091
Treehugger Robot [Fri, 19 Jan 2018 14:48:52 +0000 (14:48 +0000)]
Merge changes Id8776d14,Ifa291c62,I5ea9d200
* changes:
Track and persist in stats whether traffic is on the default network.
Add the default network to NetworkStats and NetworkStatsCollection.
Pass all default networks to NetworkStatsService
Lorenzo Colitti [Thu, 18 Jan 2018 16:12:04 +0000 (01:12 +0900)]
Track and persist in stats whether traffic is on the default network.
This change adds the defaultNetwork to the ident based on current
system networking state, and persists that value to flash.
Bug:
35142602
Test: runtest frameworks-net
Test: downloaded files using default/non-default networks while watching dumpsys netstats
Change-Id: Id8776d149b2977548a9eb455ad4926af55e25aba
Lorenzo Colitti [Thu, 18 Jan 2018 16:05:20 +0000 (01:05 +0900)]
Add the default network to NetworkStats and NetworkStatsCollection.
This allows us to maintain NetworkStats entries that track
whether the traffic was on the default network.
At the moment, the stats collection code always passes in
DEFAULT_NETWORK_NO. However, this value is a no-op, since it is
not persisted to disk. Only the ident, the uid/set/tag, and the
packet/byte/operation counters are persisted.
A future change will add defaultNetwork to the ident and start
persisting it.
Bug:
35142602
Test: runtest frameworks-net
Change-Id: Ifa291c62c0fa389b88e5561086a29dcd7cee2253
Lorenzo Colitti [Thu, 18 Jan 2018 15:50:48 +0000 (00:50 +0900)]
Pass all default networks to NetworkStatsService
This will allow NetworkStatsService to treat traffic on these
networks differently from traffic where the app selects a network
that is not the default.
Bug:
35142602
Test: runtest frameworks-net
Change-Id: I5ea9d200d9fb153490c6108bb9390bf152f297da
Andreas Gampe [Tue, 16 Jan 2018 23:11:29 +0000 (15:11 -0800)]
Debug: Add attachJvmtiAgent with classloader
Add classloader support to android.os.Debug.attachJvmtiAgent. For
the original version without a given classloader, look up the
application's main classloader.
Bug:
65016018
Bug:
70901841
Test: m
Test: cts-tradefed run commandAndExit cts-dev
Change-Id: I649b6883e05dc2f75073fe1f978423f6a7b880df
Treehugger Robot [Fri, 19 Jan 2018 04:25:12 +0000 (04:25 +0000)]
Merge "Added new SIM state related broadcasts."
Treehugger Robot [Fri, 19 Jan 2018 02:38:33 +0000 (02:38 +0000)]
Merge "Fixing app compat issue b/
72143978"
Treehugger Robot [Fri, 19 Jan 2018 01:41:08 +0000 (01:41 +0000)]
Merge "HIDL: Check error value."
Ian Pedowitz [Fri, 19 Jan 2018 00:24:11 +0000 (16:24 -0800)]
Fixing app compat issue b/
72143978
Revert "Remove obsolete workaround."
This reverts commit
5e48241a95b843c10f96c57d8544af9d04807218.
Bug:
72143978
Bug:
24465209
Test: Tested failing case on sailfish, reverted back all CL's since
Test:
3471433 for b/
24465209 and apps open
Jeff Sharkey [Thu, 18 Jan 2018 23:58:30 +0000 (23:58 +0000)]
Merge "Add ability to override subscriber capabilities."
Amit Mahajan [Sat, 13 Jan 2018 01:40:29 +0000 (17:40 -0800)]
Added new SIM state related broadcasts.
Test: Basic telephony sanity and unit tests
Bug:
64131518
Merged-in: Ie3d157e79a7040c161b9038c875a4a4f49d535ff
Change-Id: Ie3d157e79a7040c161b9038c875a4a4f49d535ff
Dan Zhang [Thu, 18 Jan 2018 22:16:39 +0000 (22:16 +0000)]
Merge "Fix <Report Audio Status> update"
Dan Zhang [Thu, 18 Jan 2018 22:16:23 +0000 (22:16 +0000)]
Merge "Fix OTP performance with no Vendor ID device"
Dan Zhang [Thu, 18 Jan 2018 22:15:39 +0000 (22:15 +0000)]
Merge "Fix NPE by pressing Volume Up/Down"
Dan Zhang [Thu, 18 Jan 2018 21:50:10 +0000 (21:50 +0000)]
Merge "Fix illegal volume value issue"
Jeff Sharkey [Thu, 18 Jan 2018 13:01:59 +0000 (22:01 +0900)]
Add ability to override subscriber capabilities.
In a future set of CLs, NPMS will offer to override a handful of
capabilities on a per-subId basis. Define a no-op version of the
interface to make it easier to add new methods in the future.
Test: bit FrameworksNetTests:android.net.,com.android.server.net.
Test: bit FrameworksTelephonyTests:com.android.internal.telephony.dataconnection.DataConnectionTest
Bug:
64133169
Change-Id: I03dfd98463861f0338c4174e8d8a88c300ea5b55
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
Treehugger Robot [Thu, 18 Jan 2018 16:42:33 +0000 (16:42 +0000)]
Merge "Added APIs for Connection-oriented channels"
David Brazdil [Tue, 16 Jan 2018 15:03:20 +0000 (15:03 +0000)]
Generate new API signatures from doclava
Doclava now generates API signatures of classes and their members
which are not part of the public SDK. Adjust the arguments passed
to Doclava to enable that feature.
Bug:
64382372
Test: m
Change-Id: I47de683dd2b00fce73b82581a13fbe1013ef625f
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 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."
Treehugger Robot [Thu, 18 Jan 2018 02:44:53 +0000 (02:44 +0000)]
Merge "Add basic resolution of Private DNS hostname"
Lorenzo Colitti [Thu, 18 Jan 2018 01:17:17 +0000 (01:17 +0000)]
Merge "Add public API methods for private DNS."
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
Nathan Harold [Thu, 18 Jan 2018 00:09:24 +0000 (16:09 -0800)]
Add Tunnel Interface APIs to IpSecManager
Add a new interface and a new management object,
IpSecTunnelInterface to the IpSecManager surface.
This object will be used to control IPsec tunnels.
-Add IpSecTunnelInterface object
-Add methods to create and use an IpSecTunnelInterface
-Update the IpSecTransform builder to create Tunnel
mode IpSecTransform objects (usable with an IpSecTunnel)
Bug:
36033193
Test: compilation
Change-Id: Ib6948b12c15c93674234dc36288058ae44435b90
Treehugger Robot [Wed, 17 Jan 2018 23:58:10 +0000 (23:58 +0000)]
Merge "Reland: Move zygote's seccomp setup to post-fork"
Treehugger Robot [Wed, 17 Jan 2018 23:48:40 +0000 (23:48 +0000)]
Merge "Bluetooth in band ring"
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"
Steven Moreland [Wed, 17 Jan 2018 21:26:35 +0000 (13:26 -0800)]
HIDL: Check error value.
HwParcel's verifySuccess method doesn't actually check
to see if the call succeeded.
Change-Id: Iaa99cbfd6f5f211facaa20c09c5e1dae8e2b8a7f
Fixes:
71813867
Test: boot walleye, hidl_test_java
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
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
Brad Ebinger [Wed, 17 Jan 2018 20:29:54 +0000 (20:29 +0000)]
Merge "Integrate IMS Registration API"
Benedict Wong [Thu, 14 Dec 2017 01:16:53 +0000 (17:16 -0800)]
Address comments and final cleanup from refcounting integration
Added some extra comments on reference counting and moved a few methods
around. No significant logical changes made in this CL
Bug:
63409385
Test: CTS, Unit tests (both frameworks-base and netd) and binder tests
all pass
Change-Id: I89f1f4a021db48ae406fefefa6aca7406045736c
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."
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
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 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
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
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 [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
yinxu [Fri, 5 Jan 2018 19:15:24 +0000 (11:15 -0800)]
Add CARD_ID in SubscriptionInfo database
Test: Basic telephony sanity
Bug:
64131518
Change-Id: I1c3c903ad2fc15fd49f4ece9ada4cbfa792a28ce
Ivan Lozano [Tue, 16 Jan 2018 20:27:36 +0000 (20:27 +0000)]
Merge "Fix doFadingAnimationLocked in sanitized builds."
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
Treehugger Robot [Tue, 16 Jan 2018 18:25:32 +0000 (18:25 +0000)]
Merge "ActivityThread: Attempt to attach agent with app's classloader"
Brad Ebinger [Thu, 14 Dec 2017 22:22:27 +0000 (14:22 -0800)]
Integrate IMS Registration API
Integrates the new IMS Registration API into the framework
and add two APIs for feature parity.
1) Moves ImsRegistrationImplBase to the android.telephony.ims
namespace
2) Expose ImsRegistration AIDL in TelephonyManager as hidden
API.
3) Adds onVoicemailCountUpdate and
onSubscriberAssociatedUriChanged APIs for feature parity.
Bug:
63987047
Test: Telephony unit tests, manual IMS tests
Merged-In: I51a8ae5cf58b81708c21adc1b26a9eb59f6280fd
Change-Id: I51a8ae5cf58b81708c21adc1b26a9eb59f6280fd
Treehugger Robot [Tue, 16 Jan 2018 14:25:13 +0000 (14:25 +0000)]
Merge changes I0d0c0fac,Ifb9b00b6
* changes:
Split updateCapabilities into two methods.
More strictly check NetworkCapabilities callbacks.
Lorenzo Colitti [Mon, 15 Jan 2018 15:52:07 +0000 (00:52 +0900)]
Split updateCapabilities into two methods.
This makes the code a bit easier to follow.
Test: ConnectivityServiceTest continues to pass
Change-Id: I0d0c0facc1e3ba07b53542b35da40ddc096ff92e
Treehugger Robot [Tue, 16 Jan 2018 12:23:02 +0000 (12:23 +0000)]
Merge "Update netId to nethandle mapping in NetworkTest."
Paul Duffin [Tue, 16 Jan 2018 10:47:47 +0000 (10:47 +0000)]
Merge "Replace legacy-test with android.test.base in bp files"
Lorenzo Colitti [Tue, 16 Jan 2018 08:18:17 +0000 (17:18 +0900)]
Update netId to nethandle mapping in NetworkTest.
Bug:
63052780
Test: NetworkTest now passes
Change-Id: I5f1cb3055b7042a19afb5dd62f082912157612ba
Hugo Benichi [Tue, 16 Jan 2018 07:10:50 +0000 (07:10 +0000)]
Merge "MacAddress: add @NonNull annotations"
Hugo Benichi [Fri, 12 Jan 2018 00:46:29 +0000 (09:46 +0900)]
MacAddress: add @NonNull annotations
This patch adds to the MacAddress class:
- getAddressType() method which replaces addressType(), for naming
consistency
- @NonNull annotations on all input and output reference values for
all public methods (@hide and public).
TYPE_UNKNOWN, which currently cannot be observed with a non @hide
method, is also removed from the public api.
Bug:
71866627
Test: $ runtest frameworks-net
Change-Id: I2af70408d46f431b7b32183e6b48ddae9a261a2c
Treehugger Robot [Tue, 16 Jan 2018 02:58:56 +0000 (02:58 +0000)]
Merge "Change the netId to nethandle mapping."
Hugo Benichi [Tue, 16 Jan 2018 00:20:52 +0000 (00:20 +0000)]
Merge "ConnectivityService: synchronize access on mLockdownEnabled"