OSDN Git Service
Xiangyu/Malcolm Chen [Wed, 24 Jan 2018 20:55:01 +0000 (20:55 +0000)]
Merge "Added network service interface" am:
71793be6bb
am:
2b06789511
Change-Id: I88aeed6b03d39e7555ad9de62b954eac62da3f79
Xiangyu/Malcolm Chen [Wed, 24 Jan 2018 20:44:04 +0000 (20:44 +0000)]
Merge "Added network service interface"
am:
71793be6bb
Change-Id: I2dab9576e8fc32f914225620733ad83b7c808015
Benedict Wong [Wed, 24 Jan 2018 19:56:24 +0000 (19:56 +0000)]
Merge "Add tunnel-mode calls to netd in IpSecService" am:
475fe28c50
am:
02d6d81006
Change-Id: I8a3d16c8e58ad1c09d967943abe1c729fe37636a
Jack He [Wed, 24 Jan 2018 19:50:46 +0000 (19:50 +0000)]
Merge "BT-HFP: Update Bluetooth headset state handler to Multi-HFP" am:
0aafefb113
am:
a8505da2a6
Change-Id: Iafb904bef6c99f4c48ca9c2ef33ea4809924a4c1
Benedict Wong [Wed, 24 Jan 2018 19:48:26 +0000 (19:48 +0000)]
Merge "Add tunnel-mode calls to netd in IpSecService"
am:
475fe28c50
Change-Id: I60bd2cd453b8ea7b5a0fb5eb0b59e8a9fe8f57cb
Jack He [Wed, 24 Jan 2018 19:42:36 +0000 (19:42 +0000)]
Merge "BT-HFP: Update Bluetooth headset state handler to Multi-HFP"
am:
0aafefb113
Change-Id: I3cb4f7ecbdafaccb40c9e9c7f791d4786583bd56
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
Felipe Leme [Wed, 24 Jan 2018 18:23:48 +0000 (18:23 +0000)]
Merge "Fixed AUTOFILL_UI_LATENCY metric." into oc-mr1-dev
am:
5e687224bd
Change-Id: I23817abcefde8700c101b756ee6a39d153ea7af5
TreeHugger Robot [Wed, 24 Jan 2018 18:13:25 +0000 (18:13 +0000)]
Merge "Fixed AUTOFILL_UI_LATENCY metric." into oc-mr1-dev
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"
Eric Schwarzenbach [Wed, 24 Jan 2018 16:52:03 +0000 (16:52 +0000)]
Merge "Add PhysicalChannelConfig." am:
c584d2772d
am:
3deaafd8cd
Change-Id: Id6ec6d693ec05d363b2847d0e4eee72fea24aef9
Eric Schwarzenbach [Wed, 24 Jan 2018 16:40:14 +0000 (16:40 +0000)]
Merge "Add PhysicalChannelConfig."
am:
c584d2772d
Change-Id: I3377d0502e74e58aed9f2cba746993130a4469dd
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."
Nicolas Geoffray [Wed, 24 Jan 2018 12:40:45 +0000 (12:40 +0000)]
Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."" am:
1f568c14ac
am:
b91d1b3e3a
Change-Id: I8cae11d0c9e4b72bc821af2a424380adaa59847d
Benoit Lamarche [Wed, 24 Jan 2018 12:36:26 +0000 (12:36 +0000)]
Merge "Fail when there is an ASM error" am:
4152497b4b
am:
05bb83c87d
Change-Id: I27be59afd9f021c2933d10b6becb0f7542162a37
Nicolas Geoffray [Wed, 24 Jan 2018 12:25:10 +0000 (12:25 +0000)]
Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""
am:
1f568c14ac
Change-Id: I49a375508824696b3f362bce720a296d85a084aa
Benoit Lamarche [Wed, 24 Jan 2018 12:21:23 +0000 (12:21 +0000)]
Merge "Fail when there is an ASM error"
am:
4152497b4b
Change-Id: Ic5ca952591fa235c7e4a28d95d9b1cb1d4644f8a
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 [Wed, 24 Jan 2018 09:02:56 +0000 (09:02 +0000)]
Merge "Add TunnelInterface API and KernelResourceRecords" am:
f811dff3bc
am:
e1aa92f1c1
Change-Id: If27d78708ce225a900ad78a82d9f323770223808
Benedict Wong [Wed, 24 Jan 2018 08:55:38 +0000 (08:55 +0000)]
Merge "Add TunnelInterface API and KernelResourceRecords"
am:
f811dff3bc
Change-Id: Ic8a93b2d6d8280c01808968251e6f422fa1d2340
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 08:19:16 +0000 (08:19 +0000)]
Merge "Add xfrm mark in IpSecConfig" am:
73f79ceae9
am:
4077e802ad
Change-Id: I03ddca0611c4e0b41edc705cdb39b415205bb14b
Holly Jiuyu Sun [Wed, 24 Jan 2018 08:10:38 +0000 (08:10 +0000)]
Merge "Add getUiccSlots() and switchSlots() in TelephonyManager." am:
8fd5b7e1c3
am:
5598f5ab23
Change-Id: Ib79c5a2d05c09c8a36dd2e761719f37520735c00
Benedict Wong [Wed, 24 Jan 2018 08:00:52 +0000 (08:00 +0000)]
Merge "Add xfrm mark in IpSecConfig"
am:
73f79ceae9
Change-Id: Idcac0878b4f74c25ef007fb7f1643fca5de80225
Holly Jiuyu Sun [Wed, 24 Jan 2018 07:48:48 +0000 (07:48 +0000)]
Merge "Add getUiccSlots() and switchSlots() in TelephonyManager."
am:
8fd5b7e1c3
Change-Id: Ia822753db39db9b383e8e987049ec4a0738ac27b
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
Cassie Han [Wed, 24 Jan 2018 06:17:42 +0000 (06:17 +0000)]
Merge "Move android.provider.Telephony.SECRET_CODE to Telephony.Intents." am:
eb9452a08d
am:
8e3dcbb5d3
Change-Id: Iacd500459bb8418d41bae56131ecdac0ac6471bd
Chalard Jean [Wed, 24 Jan 2018 06:11:06 +0000 (06:11 +0000)]
Merge changes I3b16caad,Iaf5ea7ab,I09a94042,I69a39039,I35300309, ... am:
6568170b32
am:
84af3a7b2b
Change-Id: I3f2185330789a8b02cc5e05912e3f17256ba1b86
Cassie Han [Wed, 24 Jan 2018 06:06:59 +0000 (06:06 +0000)]
Merge "Move android.provider.Telephony.SECRET_CODE to Telephony.Intents."
am:
eb9452a08d
Change-Id: Iaa4e291d0926db9ddb8123a7ec72acf1e82c4d84
Chalard Jean [Wed, 24 Jan 2018 06:03:41 +0000 (06:03 +0000)]
Merge changes I3b16caad,Iaf5ea7ab,I09a94042,I69a39039,I35300309, ...
am:
6568170b32
Change-Id: I49269ac65138be59d68561ea1c15ff2ad0339d8b
Benedict Wong [Wed, 24 Jan 2018 05:53:29 +0000 (05:53 +0000)]
Merge "Add xfrm mark in IpSecConfig"
Chenbo Feng [Wed, 24 Jan 2018 05:39:54 +0000 (05:39 +0000)]
Merge changes from topic "bpfStats" am:
6e03224697
am:
e041f38289
Change-Id: Ib4790159fd331858ce9f3343a44ccec66fae638c
Holly Jiuyu Sun [Wed, 24 Jan 2018 05:33:02 +0000 (05:33 +0000)]
Merge "Add cardId in EuiccCardManager API." am:
a85291bfcf
am:
50b8d3ef75
Change-Id: I7fdb6666728bfa31405d23c5880dba2c63a89e41
Chenbo Feng [Wed, 24 Jan 2018 05:32:34 +0000 (05:32 +0000)]
Merge changes from topic "bpfStats"
am:
6e03224697
Change-Id: I488be110cca66990f44f6e45d5489ce23f36432e
Holly Jiuyu Sun [Wed, 24 Jan 2018 05:25:49 +0000 (05:25 +0000)]
Merge "Add cardId in EuiccCardManager API."
am:
a85291bfcf
Change-Id: I583cb9bb3673b197331a032510c1949edf3dcf9c
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 02:50:47 +0000 (02:50 +0000)]
Merge "Expose applyTunnelModeTransform as a system API" am:
d056f32bd9
am:
c2253ff48d
Change-Id: I85c761df4b77dba0b62adfd3488f66cdcf780fa3
Benedict Wong [Wed, 24 Jan 2018 02:43:49 +0000 (02:43 +0000)]
Merge "Expose applyTunnelModeTransform as a system API"
am:
d056f32bd9
Change-Id: Ibebf4d53bc6b22cb32a23720f0b09e24de5e704b
Holly Jiuyu Sun [Wed, 24 Jan 2018 02:21:14 +0000 (02:21 +0000)]
Merge "Make getIEuiccContronller() protected and non-static for CTS." am:
2378a2ca0b
am:
24ba89dafe
Change-Id: Ia5313c8daab24242ae4a00bfdc23eb4f23634558
Holly Jiuyu Sun [Wed, 24 Jan 2018 02:14:31 +0000 (02:14 +0000)]
Merge "Make getIEuiccContronller() protected and non-static for CTS."
am:
2378a2ca0b
Change-Id: If8d1bc3db4be3f2d7e79f9c508ea3db3197159e9
Benedict Wong [Wed, 24 Jan 2018 01:42:30 +0000 (01:42 +0000)]
Merge "Expose applyTunnelModeTransform as a system API"
Xiangyu/Malcolm Chen [Wed, 24 Jan 2018 01:23:32 +0000 (01:23 +0000)]
Merge "Add TransportType in AccessNetworkConstants.java" am:
afd65d9d1c
am:
dae9a8e839
Change-Id: I593635999bdfa290b012313d9967bddfc5e7bfe1
Xiangyu/Malcolm Chen [Wed, 24 Jan 2018 01:12:24 +0000 (01:12 +0000)]
Merge "Add TransportType in AccessNetworkConstants.java"
am:
afd65d9d1c
Change-Id: Ie0ef55c0a3e75937a0e68b364bf6e202ad0678bd
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."
nharold [Wed, 24 Jan 2018 01:08:33 +0000 (01:08 +0000)]
Merge changes from topic "signal-strength-cleanup" am:
fb24180fe0
am:
2621c9f6ad
Change-Id: I30b5deb01ed68dc0e235e9997fa147aadb924749
Nathan Harold [Wed, 24 Jan 2018 01:05:07 +0000 (01:05 +0000)]
Cleanup SignalStrength Parcel am:
9becf4b334
am:
02f4ec2eed
Change-Id: I9e862b15ab4b5871d9d7e00af86ab9049b5b7b50
nharold [Wed, 24 Jan 2018 00:58:38 +0000 (00:58 +0000)]
Merge changes from topic "signal-strength-cleanup"
am:
fb24180fe0
Change-Id: Iad22d4d91032a87877994bfca00c4f80d11f66c0
Nathan Harold [Wed, 24 Jan 2018 00:54:13 +0000 (00:54 +0000)]
Cleanup SignalStrength Parcel
am:
9becf4b334
Change-Id: I44e6b2187bbcb2334adb40be5d438f581d9638bb
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
Jack Yu [Tue, 23 Jan 2018 22:00:39 +0000 (22:00 +0000)]
Merge "Combined flags of data service requests into one reason param" am:
7d441c9b27
am:
28f64b869c
Change-Id: I5823943d1e3bed41f4bd26fa1d718d6a2e6acc48
Robert Sesek [Tue, 23 Jan 2018 21:52:04 +0000 (21:52 +0000)]
Merge "Use the correct value for Process.WEBVIEW_ZYGOTE_UID." am:
572f65fb58
am:
cb7119385e
Change-Id: Iaf7a31629d06d87400796899f659926e5186ac41
Felipe Leme [Tue, 23 Jan 2018 21:46:43 +0000 (21:46 +0000)]
Merge "DO NOT MERGE - fix AFM.getComponentNameFromContext()" into oc-mr1-dev
am:
2eeab61b4c
Change-Id: Idda0d7fbc0f63bcbad44da6a46cef786770a2851
Jack Yu [Tue, 23 Jan 2018 21:46:18 +0000 (21:46 +0000)]
Merge "Combined flags of data service requests into one reason param"
am:
7d441c9b27
Change-Id: I6e8069639e5d7d57fde69747fb78d044e625680e
Robert Sesek [Tue, 23 Jan 2018 21:42:19 +0000 (21:42 +0000)]
Merge "Use the correct value for Process.WEBVIEW_ZYGOTE_UID."
am:
572f65fb58
Change-Id: I822fdad1c22de97884e389f651230ef31cd65deb
TreeHugger Robot [Tue, 23 Jan 2018 21:39:09 +0000 (21:39 +0000)]
Merge "DO NOT MERGE - fix AFM.getComponentNameFromContext()" into oc-mr1-dev
Benedict Wong [Tue, 23 Jan 2018 19:55:47 +0000 (19:55 +0000)]
Merge "Add checks to ensure SPIs are not reused" am:
0a1dd194aa
am:
1a2e3f3b54
Change-Id: I8c7243bc600e5f2e9abec03b5a357ed6376aa9bf
Amit Mahajan [Tue, 23 Jan 2018 19:50:57 +0000 (19:50 +0000)]
Merge "Added new slot status related broadcast." am:
cdc0a084d1
am:
40effae0f3
Change-Id: I3a4174eff2dc8ce017aae4c2d31f2facde02dbe5
Treehugger Robot [Tue, 23 Jan 2018 19:43:25 +0000 (19:43 +0000)]
Merge "Combined flags of data service requests into one reason param"
Lorenzo Colitti [Tue, 23 Jan 2018 19:43:13 +0000 (19:43 +0000)]
Merge changes from topic "multipath-datausage-backport" am:
df984fae26
am:
c46c21c702
Change-Id: I45f0c69e3440e9ec69c82e81c41bea682a359389
Lorenzo Colitti [Tue, 23 Jan 2018 19:39:18 +0000 (19:39 +0000)]
Add metered, roaming, and defaultNetwork info to NetworkTemplate. am:
0f9bce6883
am:
e383807d7f
Change-Id: I1faf95edec0e836c69016c84ad2a2c8518f8eb53
Lorenzo Colitti [Tue, 23 Jan 2018 19:36:02 +0000 (19:36 +0000)]
Unbreak frameworks-net tests broken by missing libutilscallstack. am:
f7fab104f9
am:
df4aba36b4
Change-Id: I904ec7dee1f4f565a1db138e45c9e5497fbb2855
Lorenzo Colitti [Tue, 23 Jan 2018 19:33:27 +0000 (19:33 +0000)]
Disable IpConnectivityMetricsTest. am:
b7a479c293
am:
afb4ba1c35
Change-Id: Ic5a24e40ce126bc872281bb353706a245eb345f2
Lorenzo Colitti [Tue, 23 Jan 2018 19:30:57 +0000 (19:30 +0000)]
Add the defaultNetwork element to the netstats.proto. am:
9781f785bc
am:
adcb94472a
Change-Id: I292e903617d3af1867529e68eb20538afb66f665
Lorenzo Colitti [Tue, 23 Jan 2018 19:28:14 +0000 (19:28 +0000)]
Add getDefaultNetwork to the NetworkStats public API. am:
d5876bc438
am:
66eab17abc
Change-Id: If0aa0a4522df0061645d34cb3af8a33f288ed46d
Benedict Wong [Tue, 23 Jan 2018 19:27:51 +0000 (19:27 +0000)]
Merge "Add checks to ensure SPIs are not reused"
am:
0a1dd194aa
Change-Id: I893925014557e5ae13303debc4ee8f50faf9605d
Amit Mahajan [Tue, 23 Jan 2018 19:24:04 +0000 (19:24 +0000)]
Merge "Added new slot status related broadcast."
am:
cdc0a084d1
Change-Id: Ia81c5648a943bf1c13b1434b40dd09c6789a6576
Lorenzo Colitti [Tue, 23 Jan 2018 19:17:54 +0000 (19:17 +0000)]
Merge changes from topic "multipath-datausage-backport"
am:
df984fae26
Change-Id: Ic29d71ade161434b6dea796a887f60b5587ca1d5
Lorenzo Colitti [Tue, 23 Jan 2018 19:13:30 +0000 (19:13 +0000)]
Add metered, roaming, and defaultNetwork info to NetworkTemplate.
am:
0f9bce6883
Change-Id: I28e7f539fc5e0698cb8ef663aafae7a2cd579d68
Lorenzo Colitti [Tue, 23 Jan 2018 19:09:07 +0000 (19:09 +0000)]
Unbreak frameworks-net tests broken by missing libutilscallstack.
am:
f7fab104f9
Change-Id: I3125e9276da6cbbae5ef490cf98583b31c4ad8d2
Lorenzo Colitti [Tue, 23 Jan 2018 19:04:05 +0000 (19:04 +0000)]
Disable IpConnectivityMetricsTest.
am:
b7a479c293
Change-Id: Iba9dad4001c6aa725285eee6df32f116c846532d
Lorenzo Colitti [Tue, 23 Jan 2018 18:57:44 +0000 (18:57 +0000)]
Add the defaultNetwork element to the netstats.proto.
am:
9781f785bc
Change-Id: I725132a756baacbc42c573274f5687cf58225498
Lorenzo Colitti [Tue, 23 Jan 2018 18:50:20 +0000 (18:50 +0000)]
Add getDefaultNetwork to the NetworkStats public API.
am:
d5876bc438
Change-Id: Ifbe3d8ede39c87d64eee20adcfbdd92479d09e69
Badhri Jagan Sridharan [Tue, 23 Jan 2018 18:45:03 +0000 (18:45 +0000)]
Merge "Add support for UsbDeviceManager to talk to USB GADGET HAL" am:
bf996dd479 -s ours
am:
5400d4dc4f
Change-Id: I4eab9733b7bf766f559c2423f534bc5d9b1a1066
Badhri Jagan Sridharan [Tue, 23 Jan 2018 18:36:01 +0000 (18:36 +0000)]
Merge "Add support for UsbDeviceManager to talk to USB GADGET HAL"
am:
bf996dd479 -s ours
Change-Id: I174f0a10e4ecb76607ed5e92e60ebf3a9523e6d9
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
OSDN Git Service
