OSDN Git Service
Jason Monk [Thu, 25 Jan 2018 00:19:20 +0000 (19:19 -0500)]
Fix nav keys being tiny on sw600dp devices
Test: visual
Change-Id: I4e7ce2e7d102c980a0953a3f8f8422933a4b1923
Fixes:
68268902
Treehugger Robot [Wed, 24 Jan 2018 23:09:28 +0000 (23:09 +0000)]
Merge "Set Zygote.DISABLE_HIDDEN_API_CHECKS for system apps"
Treehugger Robot [Wed, 24 Jan 2018 21:49:00 +0000 (21:49 +0000)]
Merge "Add scan interval and window lengths to Settings.Global."
David Brazdil [Wed, 17 Jan 2018 18:06:47 +0000 (18:06 +0000)]
Set Zygote.DISABLE_HIDDEN_API_CHECKS for system apps
When forking a process for a system app, pass a flag to ART that
will disable enforcement of hidden API access checks.
Test: manual
Bug:
64382372
Change-Id: I5ba81d84a44c9467613f060428b11e1d9d725bd3
Holly Jiuyu Sun [Wed, 24 Jan 2018 21:11:07 +0000 (21:11 +0000)]
Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."""
Treehugger Robot [Wed, 24 Jan 2018 20:28:21 +0000 (20:28 +0000)]
Merge "Set DEXOPT_DISABLE_HIDDEN_API_CHECKS for system apps"
Treehugger Robot [Wed, 24 Jan 2018 19:33:33 +0000 (19:33 +0000)]
Merge "Add new IMS reasoninfo to handle alternate emergency disconnect scenario."
Xiangyu/Malcolm Chen [Wed, 24 Jan 2018 19:13:58 +0000 (19:13 +0000)]
Merge "Added network service interface"
Jack Yu [Thu, 21 Dec 2017 19:00:05 +0000 (11:00 -0800)]
Added network service interface
The interface for mobile network service. This is the base class
for vendor or first party data service provider to implement
the network service for cellular or IWLAN network support.
Test: Manual
bug:
64132030
Change-Id: Ia358cbb18fc6d15dcc45c75f14b7c952f899e101
Benedict Wong [Wed, 24 Jan 2018 18:10:55 +0000 (18:10 +0000)]
Merge "Add tunnel-mode calls to netd in IpSecService"
Treehugger Robot [Wed, 24 Jan 2018 18:03:21 +0000 (18:03 +0000)]
Merge "BT-HFP: Update Bluetooth headset state handler to Multi-HFP"
Holly Jiuyu Sun [Wed, 24 Jan 2018 17:57:39 +0000 (17:57 +0000)]
Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""
This reverts commit
5c9dcc0e7202884b3a4a54c28f30854f377fde29.
Reason for revert: The original failure was not caused by this CL and this CL does not depend on the broken one.
Change-Id: Ia60e21f634d8f307f1cf5a3992cb38de04c5f443
Jack He [Wed, 17 Jan 2018 23:45:12 +0000 (15:45 -0800)]
BT-HFP: Update Bluetooth headset state handler to Multi-HFP
* When multiple headset devices are connected at the same time, at most one
device can be used for SCO audio at any time. This device is called
Active Device and is indicated by either
BluetoothHeadset.getActiveDevice() or
BluetoothHeadset.ACTIVE_DEVICE_CHANGED intent. It can also be set
through BluetoothHeadset.setActiveDevice(BluetoothDevice) internal API.
* This change let AudioService to listen to ACTIVE_DEVICE_CHANGED intent
instead of CONNECTION_STATE_CHANGED intent since it is the active
device that AudioService cares about, not the list of connected
devices.
* Everytime a new active device is set, AudioService will treat the old
one (if not null) as disconnected and call disconnection methods in
audio framework and the new active device is regarded as newly
connected and connection methods will be called by AudioService.
* When disconnectHeadset() is called, active device will be set to null
Bug:
71875419
Test: compile, connect multiple HFP devices and switch active device
among them
Change-Id: I148cca079d36a2dfc6a46b8d42ba69821c9c6de3
Eric Schwarzenbach [Wed, 24 Jan 2018 16:17:53 +0000 (16:17 +0000)]
Merge "Add PhysicalChannelConfig."
David Brazdil [Thu, 18 Jan 2018 15:25:18 +0000 (15:25 +0000)]
Set DEXOPT_DISABLE_HIDDEN_API_CHECKS for system apps
For now, system apps will be exempt from hidden API access checks.
Pass the appropriate flag to dexopt.
Test: manual
Bug:
64382372
Bug:
72305689
Merged-In: I5676ffa3a5ba680bf5f6bab0b62f0acf4a933097
Change-Id: Idc3067d2c6040f15fe0f051090ba45efe591ebae
Nicolas Geoffray [Wed, 24 Jan 2018 10:44:10 +0000 (10:44 +0000)]
Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""
Benoit Lamarche [Wed, 24 Jan 2018 09:59:28 +0000 (09:59 +0000)]
Merge "Fail when there is an ASM error"
Nicolas Geoffray [Wed, 24 Jan 2018 09:11:40 +0000 (09:11 +0000)]
Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."
AOSP build broken.
Bug:
71914112
This reverts commit
2f87d7b2ee5097eae4e2a62858fbe221dac857f6.
Change-Id: I53537a6da7616fe6dbbb79927b32720bbeaf1f69
Benedict Wong [Sat, 20 Jan 2018 01:36:02 +0000 (17:36 -0800)]
Add tunnel-mode calls to netd in IpSecService
Adds calls to relevant netd methods in IpSecService, enabling Tunnel
mode functionality.
Bug:
63588681
Test: Compiles, passing CTS + unit tests
Change-Id: I6deb68584cddb03f21bd76370d4ef69cadc1bf16
Benedict Wong [Wed, 24 Jan 2018 07:25:04 +0000 (07:25 +0000)]
Merge "Add TunnelInterface API and KernelResourceRecords"
Benedict Wong [Fri, 19 Jan 2018 02:31:45 +0000 (18:31 -0800)]
Add TunnelInterface API and KernelResourceRecords
This change adds one KernelResourceRecord type (TunnelInterfaceRecord),
and adds methods for the creation of TunnelInterfaces, as well as the
application of Transforms to the given TunnelInterfaces
As part of the generation of ikeys/okeys, a ReserveKeyTracker manages a
java bitset to avoid collisions and reserve/release keys.
Bug:
63588681
Test: Compiles, CTS, unit tests all pass on AOSP_marlin
Change-Id: I9e9b6455e27073acd4491eae666aa966b3b10e0f
Eric Schwarzenbach [Fri, 19 Jan 2018 01:15:51 +0000 (17:15 -0800)]
Add PhysicalChannelConfig.
Adds a field to PhoneStateListener to listen for changes to the
PhysicalChannelConfig list.
Bug:
72117533
Test: make
Change-Id: I353a4b90354d54948bce75968fb5fe1803efd093
Benedict Wong [Wed, 24 Jan 2018 05:53:29 +0000 (05:53 +0000)]
Merge "Add xfrm mark in IpSecConfig"
Holly Jiuyu Sun [Wed, 24 Jan 2018 05:08:19 +0000 (05:08 +0000)]
Merge "Add getUiccSlots() and switchSlots() in TelephonyManager."
Cassie Han [Wed, 24 Jan 2018 04:55:32 +0000 (04:55 +0000)]
Merge "Move android.provider.Telephony.SECRET_CODE to Telephony.Intents."
Chalard Jean [Wed, 24 Jan 2018 04:09:44 +0000 (04:09 +0000)]
Merge changes I3b16caad,Iaf5ea7ab,I09a94042,I69a39039,I35300309, ...
* changes:
Let network requests see VPNs.
Move constants into a new file.
Make sure listen requests from VPN apps see their own networks
Add a test for new UID checking code.
Remove UID_RANGES_ADDED and REMOVED.
Move VPN allowed UIDs into NetworkCapabilities.
Pre-import to remove a conflict.
Treehugger Robot [Wed, 24 Jan 2018 04:08:29 +0000 (04:08 +0000)]
Merge changes from topic "bpfStats"
* changes:
Use /proc/net/dev to get stats summary
Add bpf support for NetworkStatsFactory
Add BPF support for NetworkStatsService
Holly Jiuyu Sun [Wed, 24 Jan 2018 04:06:40 +0000 (04:06 +0000)]
Merge "Add cardId in EuiccCardManager API."
Benedict Wong [Wed, 24 Jan 2018 01:42:30 +0000 (01:42 +0000)]
Merge "Expose applyTunnelModeTransform as a system API"
Holly Jiuyu Sun [Wed, 24 Jan 2018 00:49:22 +0000 (16:49 -0800)]
Add cardId in EuiccCardManager API.
Removed getEid() API.
Bug:
38206971
Test: test on phone
Change-Id: I7e484f889a780900acd3a05a96fbbc632e1ec682
Holly Jiuyu Sun [Wed, 24 Jan 2018 01:09:44 +0000 (01:09 +0000)]
Merge "Make getIEuiccContronller() protected and non-static for CTS."
Jeremy Klein [Thu, 11 Jan 2018 02:01:46 +0000 (18:01 -0800)]
Add scan interval and window lengths to Settings.Global.
This will enable running experiments to determine the
effects on battery life of changing these values.
Bug:
71765044
Test: Just adding a key value here. This is basically a no-op.
Change-Id: I33a0b2da6e793ef508d020a3c2d321d5553c3fb1
Xiangyu/Malcolm Chen [Tue, 23 Jan 2018 23:39:10 +0000 (23:39 +0000)]
Merge "Add TransportType in AccessNetworkConstants.java"
Holly Jiuyu Sun [Fri, 12 Jan 2018 02:47:04 +0000 (18:47 -0800)]
Add getUiccSlots() and switchSlots() in TelephonyManager.
Bug:
71914112
Test: test on phone
Change-Id: Ib7e9e40e5ecda48bdcd1f332dc7d6c422c08d942
Benedict Wong [Tue, 23 Jan 2018 19:01:28 +0000 (11:01 -0800)]
Expose applyTunnelModeTransform as a system API
Simple change to expose systemAPI for applyTunnelModeTransform
Bug:
36033193
Test: All CTS, unit tests passing
Change-Id: I2d857c048bc0dc80c3949387f946b1f5adf0527e
nharold [Tue, 23 Jan 2018 23:23:48 +0000 (23:23 +0000)]
Merge changes from topic "signal-strength-cleanup"
* changes:
Fix getAsuLevel returns "99" in Lte and TdScdma.
Cleanup SignalStrength Parcel
Cassie [Sat, 20 Jan 2018 01:23:36 +0000 (17:23 -0800)]
Move android.provider.Telephony.SECRET_CODE to Telephony.Intents.
Bug:
69616728
Test: Basic telephony sanity
Change-Id: Ia053f9be082ceb139a284598ee2398a25daa7e08
Treehugger Robot [Tue, 23 Jan 2018 19:43:25 +0000 (19:43 +0000)]
Merge "Combined flags of data service requests into one reason param"
Holly Jiuyu Sun [Fri, 19 Jan 2018 18:27:56 +0000 (10:27 -0800)]
Make getIEuiccContronller() protected and non-static for CTS.
Test: test on phone
Change-Id: I706a0a9e064a0f2f91674cb2ff38a5929eaaf627
yifan.bai [Fri, 20 Oct 2017 02:25:11 +0000 (10:25 +0800)]
Fix getAsuLevel returns "99" in Lte and TdScdma.
GetAsuLevel method judges valid signal by
getLteLevel/getTdScdmaLevel. However, level is
SIGNAL_STRENGTH_NONE_OR_UNKNOWN does not mean not in
Lte/TdScdma.
For example, if mLteRsrp is in (threshRsrp[1],
threshRsrp[0]], getLteLevel would return
SIGNAL_STRENGTH_NONE_OR_UNKNOWN. But this only
means Lte signal is very weak, and ASU should be
(mLteRsrp + 140) not "99" (3GPP 27.007 Sec 8.69).
Bug:
72116430
Test: Build
Change-Id: If930c3e3d23a9af7b2e51e3560cc28607a6328c0
Nathan Harold [Fri, 19 Jan 2018 00:45:40 +0000 (16:45 -0800)]
Cleanup SignalStrength Parcel
Clean up the SignalStrength parcel. This CL
removes redundant constructors, simplifies the
overall initialization process, and stratifies
the components of the parcel into 2 separate
parts: the strength values from RIL, and the
config values provided by the platform.
Bug:
72116430
Test: runtest frameworks-telephony
Change-Id: Id7d2339362270b3911e96094275e1e545d6b581c
Malcolm Chen [Tue, 23 Jan 2018 00:00:29 +0000 (16:00 -0800)]
Add TransportType in AccessNetworkConstants.java
Bug:
64132030
Test: build
Change-Id: I916a0b889110195d23b2a531308171cf4ea74f0c
Treehugger Robot [Tue, 23 Jan 2018 18:14:00 +0000 (18:14 +0000)]
Merge "Use the correct value for Process.WEBVIEW_ZYGOTE_UID."
Benedict Wong [Tue, 23 Jan 2018 18:00:06 +0000 (18:00 +0000)]
Merge "Add checks to ensure SPIs are not reused"
Treehugger Robot [Tue, 23 Jan 2018 18:00:00 +0000 (18:00 +0000)]
Merge "Added new slot status related broadcast."
Lorenzo Colitti [Tue, 23 Jan 2018 15:22:18 +0000 (15:22 +0000)]
Merge changes from topic "multipath-datausage-backport"
* changes:
Support passing a template to NetworkStatsManager queries.
Add metered, roaming, and defaultNetwork info to NetworkTemplate.
Unbreak frameworks-net tests broken by missing libutilscallstack.
Disable IpConnectivityMetricsTest.
Add the defaultNetwork element to the netstats.proto.
Add getDefaultNetwork to the NetworkStats public API.
Chalard Jean [Wed, 10 Jan 2018 12:19:32 +0000 (21:19 +0900)]
Let network requests see VPNs.
Test: runtest frameworks-net
Test: also tested with VPN app
Test: also cts passing
Change-Id: I3b16caad7787c3c1f2921ca1583815c89efbadc5
Chalard Jean [Fri, 19 Jan 2018 08:00:47 +0000 (17:00 +0900)]
Move constants into a new file.
Also audit all constants, make some private, annotate some
with @VisibleForTesting.
Test: runtest framework && cts
Change-Id: Iaf5ea7abd36fd8d544dcc84654f6cb529196d654
Chalard Jean [Wed, 17 Jan 2018 06:10:05 +0000 (15:10 +0900)]
Make sure listen requests from VPN apps see their own networks
Test: runtest frameworks-net
Test: CTS pass, including with the next patch which is what this
actually matters for
Change-Id: I09a94042acbefa24ab884f95326e30d6ab280b82
Chalard Jean [Fri, 12 Jan 2018 08:22:49 +0000 (17:22 +0900)]
Add a test for new UID checking code.
Test: manual, this is a new test and it passes
Change-Id: I69a39039647ec05f970700e36c5f1e1e6e110f4a
Chalard Jean [Tue, 16 Jan 2018 09:43:05 +0000 (18:43 +0900)]
Remove UID_RANGES_ADDED and REMOVED.
Test: runtest frameworks-net
Test: also tested with VPN app
Test: also cts passing
Change-Id: I3530030996daeba05a8f2fffc5c6e21ed62e3f40
Chalard Jean [Wed, 27 Dec 2017 05:23:31 +0000 (14:23 +0900)]
Move VPN allowed UIDs into NetworkCapabilities.
Test: runtest frameworks-net
Test: also new specific tests for this new code
Test: also tested with VPN app
Test: also cts passing
Change-Id: If0311bae2bf99dedac959febadecf4f92f3064b8
Chalard Jean [Tue, 23 Jan 2018 12:25:37 +0000 (21:25 +0900)]
Pre-import to remove a conflict.
Test: compiles and passes checkstyle
Change-Id: I1ffdd88e6268fee0cf88992420ab21eb42928957
Lorenzo Colitti [Mon, 22 Jan 2018 12:00:49 +0000 (21:00 +0900)]
Support passing a template to NetworkStatsManager queries.
Currently, NetworkStatsManager queries and callbacks only allow
selecting network traffic based on network identifiers:
networkType, subscriptionId and networkId. The code ends up
converting these into a template under the hood.
Now that templates can express more fine-grained queries (e.g.,
select only roaming traffic, or select only traffic that's not
on the default network) add a hidden method to pass in a
template. This should have no security implications, as all the
access controls are performed in NetworkStatsService.
Bug:
35142602
Test: android.app.usage.cts.NetworkUsageStatsTest passes
Change-Id: Iab4afa26b34544299d2a9c501c1b0feb470e90a9
Merged-In: Iab4afa26b34544299d2a9c501c1b0feb470e90a9
Lorenzo Colitti [Mon, 22 Jan 2018 02:54:46 +0000 (11:54 +0900)]
Add metered, roaming, and defaultNetwork info to NetworkTemplate.
This will allow data usage clients to query for and receive
callbacks on data usage matching these conditions.
Bug:
35142602
Test: atest FrameworksNetTests
Change-Id: I4d985a2734eeab7ee454c09cc2098b6b3c671c23
Merged-In: I4d985a2734eeab7ee454c09cc2098b6b3c671c23
Lorenzo Colitti [Mon, 22 Jan 2018 03:53:18 +0000 (12:53 +0900)]
Unbreak frameworks-net tests broken by missing libutilscallstack.
Test: atest FrameworksNetTest shows fewer failures
Change-Id: Ic6f2bc18e80d91226d8d49e047e3997ffc45e45a
Merged-In: Ic6f2bc18e80d91226d8d49e047e3997ffc45e45a
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
Chenbo Feng [Fri, 19 Jan 2018 03:48:52 +0000 (19:48 -0800)]
Use /proc/net/dev to get stats summary
If the qtaguid proc file is no longer exist, the device is running new
eBPF module to do traffic accounting. So the NetworkStatsFactory need to
use the proc/net/dev interface to get the per interface traffic stats
summary. Also, adding a test to verify the helper function work properly
Bug:
30950746
Test: run NetworkStatsFactoryTest
Change-Id: Ia36808bf02f1637dd41a3e7c50917b91b1a77524
Chenbo Feng [Tue, 21 Nov 2017 01:03:59 +0000 (17:03 -0800)]
Add bpf support for NetworkStatsFactory
Add the native method used to read the detail information of network
stats from bpf maps. The native method of NetworkStatsFactory should
choose the correct implementation to get the stats detail depending on
the kernel version. Currently the bpf result is printed as a reference
and the actual behavior of NetworkStatsFactory should not change.
Test: NetworkStatsFactory related cts test should not fail.
Bug:
30950746
Change-Id: I4715a23559b5b2306bd556cea0431f0ed172a993
Chenbo Feng [Tue, 21 Nov 2017 02:23:46 +0000 (18:23 -0800)]
Add BPF support for NetworkStatsService
Add the native implementation for NetworkStatsService to read the
uidStatsMap and tagStatsMap to get the network traffic information.
Currently the implementation only try to get the data from bpf for a
reference but the final value returned is still from old xt_qtaguid
module. So the result will not be effected. The bpf implementation is
depending on libbpf inside netd.
Bug:
30950746
Test: CtsNetTestCases -t android.net.cts.TrafficStatsTest
Change-Id: Ia85e4d4d602f6bd536739d89085e6dc37ad82e15
Benedict Wong [Thu, 14 Dec 2017 02:26:40 +0000 (18:26 -0800)]
Add checks to ensure SPIs are not reused
This change adds an additional check in CheckIpsecConfig to prevent
users from using the same SPI twice. This allows for a more granular
error message.
Bug:
70642141
Test: Tests added in IpSecServiceParameterizedTest
Change-Id: I9621fb05c6b162bd8ae8db4ac1e64feaa9d0ac73
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"
Amit Mahajan [Fri, 19 Jan 2018 01:51:53 +0000 (17:51 -0800)]
Added new slot status related broadcast.
Test: none
Bug:
64131518
Merged-in: I0a5825a1d121dc22f042fd71598f58e064e9e2a2
Change-Id: I0a5825a1d121dc22f042fd71598f58e064e9e2a2
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"
Jack Yu [Sun, 21 Jan 2018 03:41:00 +0000 (19:41 -0800)]
Combined flags of data service requests into one reason param
Made the API flexible for future expansion. The two boolean flag
'reasonShutdown' and 'isHandover' are merged into the 'reason'
params.
Test: Manual
bug:
64132030
Change-Id: I29a0ca6a7c3b897910f3bb6076f44315adc91893
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
Robert Sesek [Mon, 22 Jan 2018 17:26:39 +0000 (12:26 -0500)]
Use the correct value for Process.WEBVIEW_ZYGOTE_UID.
When the libcutils constant was added there a merge conflict, which
caused the AID_WEBVIEW_ZYGOTE value to land with a different value than
the Java-side Process value. Nothing yet uses the Process constant, so
there were no ill effects.
Test: m
Change-Id: I8cc87bce1ddbdcdaf79d85c828d86837e96cce21
Benoit Lamarche [Mon, 22 Jan 2018 16:38:41 +0000 (17:38 +0100)]
Fail when there is an ASM error
Otherwise during a build, Locked Region Code Injection may encounter an
ASM Analyzer exception, and the build will not fail, even though
injection won't have succeeded.
Test: make
Change-Id: Iee69f1a78fde735db62c7f73405b8cec4e410793
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."