OSDN Git Service
Eric Schwarzenbach [Thu, 25 Jan 2018 15:49:59 +0000 (15:49 +0000)]
Merge "Update CellInfo API to accomodate new fields." am:
7e73c73f89
am:
4dac182030
Change-Id: Ifef2f68a49fb74c11fb845590e08040972f7d27b
David Brazdil [Thu, 25 Jan 2018 15:33:47 +0000 (15:33 +0000)]
Merge "Create hidden API lists" am:
b6a5c92b50
am:
265863f9d9
Change-Id: I4d32dccc7c00216102b6bd91ed1f185c03c2c048
Eric Schwarzenbach [Thu, 25 Jan 2018 15:23:48 +0000 (15:23 +0000)]
Merge "Add ServiceState APIs for carrier aggregation." am:
185a89caf1
am:
d529242eea
Change-Id: Id55c68bed1fceff1d6d83793b190188b42d99435
Eric Schwarzenbach [Thu, 25 Jan 2018 15:23:20 +0000 (15:23 +0000)]
Merge "Update CellInfo API to accomodate new fields."
am:
7e73c73f89
Change-Id: Ib82c77d3b5559d593dbb3181add634eee251f53b
Malcolm Chen [Thu, 25 Jan 2018 15:19:06 +0000 (15:19 +0000)]
Merge "Add slotId in INetworkService.aidl methods." am:
b1c6aa4567
am:
9348e258cd
Change-Id: I0dba0926979d53951cea53761a4527b246fcb98e
David Brazdil [Thu, 25 Jan 2018 15:14:58 +0000 (15:14 +0000)]
Merge "Create hidden API lists"
am:
b6a5c92b50
Change-Id: I176c79560b1cc74182de4cf080b105fc91afce22
Eric Schwarzenbach [Thu, 25 Jan 2018 15:09:59 +0000 (15:09 +0000)]
Merge "Add ServiceState APIs for carrier aggregation."
am:
185a89caf1
Change-Id: I15e52f02c204805efacbd22eaad9a1e7218ff3ca
Malcolm Chen [Thu, 25 Jan 2018 15:06:59 +0000 (15:06 +0000)]
Merge "Add slotId in INetworkService.aidl methods."
am:
b1c6aa4567
Change-Id: I950f4617cbe6abcd8c943e1cc0b5aba60163f202
Treehugger Robot [Thu, 25 Jan 2018 12:50:37 +0000 (12:50 +0000)]
Merge "Update CellInfo API to accomodate new fields."
David Brazdil [Thu, 25 Jan 2018 07:55:35 +0000 (07:55 +0000)]
Merge "Create hidden API lists"
nharold [Thu, 25 Jan 2018 07:49:59 +0000 (07:49 +0000)]
Merge "Move Keepalive out of IpSecTransform.Builder" am:
af3fb3efe4
am:
bbb4b05a64
Change-Id: I383aa402d9d570ee7c7d5a603d022d1dade267a5
Treehugger Robot [Thu, 25 Jan 2018 07:47:55 +0000 (07:47 +0000)]
Merge "Add ServiceState APIs for carrier aggregation."
Chalard Jean [Thu, 25 Jan 2018 07:41:44 +0000 (07:41 +0000)]
Merge "Fix a bug where a NetworkAgent gets repeatedly torn down" am:
a8452ed2a6
am:
806f0191d4
Change-Id: Ifd63fdf47348dc3a1c1871deacc61470784bdbb6
nharold [Thu, 25 Jan 2018 07:37:00 +0000 (07:37 +0000)]
Merge "Move Keepalive out of IpSecTransform.Builder"
am:
af3fb3efe4
Change-Id: I5ef319815e27c321ce4fee0cb671f16372e9a604
Chalard Jean [Thu, 25 Jan 2018 07:33:35 +0000 (07:33 +0000)]
Merge "Fix a bug where a NetworkAgent gets repeatedly torn down"
am:
a8452ed2a6
Change-Id: Ic37c9f60448b10c861a78848bed18ebd4e0ad910
Eric Schwarzenbach [Wed, 10 Jan 2018 19:33:52 +0000 (11:33 -0800)]
Update CellInfo API to accomodate new fields.
Adds CellConnectionStatus to top level CellInfo type. Adds cell bandwidth
to the CellIdentityLte.
Bug:
72117223
Test: runtest frameworks-telephony
Change-Id: Id5f3b5a2bd4119c099f5e739d5579974e7adc897
Treehugger Robot [Thu, 25 Jan 2018 07:13:17 +0000 (07:13 +0000)]
Merge "Add slotId in INetworkService.aidl methods."
nharold [Thu, 25 Jan 2018 05:50:33 +0000 (05:50 +0000)]
Merge "Move Keepalive out of IpSecTransform.Builder"
Chalard Jean [Thu, 25 Jan 2018 05:37:21 +0000 (05:37 +0000)]
Merge "Fix a bug where a NetworkAgent gets repeatedly torn down"
Chalard Jean [Thu, 25 Jan 2018 00:41:51 +0000 (09:41 +0900)]
Fix a bug where a NetworkAgent gets repeatedly torn down
mUids is not marshalled correctly when null so if the
NetworkAgent runs in another process and is not a VPN then
the system will see its allowed Uids as being the empty
list (= nobody can use this network) instead of a null
list (= everybody can use this network). This breaks
emulator networking.
Bug:
72436966
Test: runtests frameworks-net
Test: also manual testing, this does fix emulator networking
and seems not to break phone networking
Change-Id: Id2bbf3808e80b19cd055c832c11cf72372710942
Jeremy Klein [Thu, 25 Jan 2018 03:44:46 +0000 (03:44 +0000)]
Merge "Add FLAG_ACTIVITY_NEW_TASK when starting UI-based tether provisioning." am:
f4dc715575
am:
4c2c7bedf9
Change-Id: I5d214df392ed17c7de0456f535f9b550485c8fc2
Jeremy Klein [Thu, 25 Jan 2018 03:35:06 +0000 (03:35 +0000)]
Merge "Add FLAG_ACTIVITY_NEW_TASK when starting UI-based tether provisioning."
am:
f4dc715575
Change-Id: I1f603f966aeb5d828746969295f51e2f01096bc4
Jun Yin [Thu, 25 Jan 2018 03:34:13 +0000 (03:34 +0000)]
Merge "Adds stripTrailingFs" am:
27bb333e14
am:
a91491a3b8
Change-Id: I6b850d252fb40395bc312f4ed8be383153af52ef
Nathan Harold [Thu, 7 Dec 2017 03:12:28 +0000 (19:12 -0800)]
Move Keepalive out of IpSecTransform.Builder
The lifecycle of Keepalive offloading is, unfortunately
different from that of an IpSecTransform. Because starting
a keepalive is fundamentally asynchronous, and isn't valid
until after a transform exists, it will now be a separate
optional procedure that may succeed or fail. It remains
linked with a Transform by the need for a Transform to exist
in order to initiate a Keepalive.
Bug:
38350389
Test: compilation
Change-Id: Ia76fccee41f86d694dff436043293d0c0762c041
Jun Yin [Thu, 25 Jan 2018 03:27:05 +0000 (03:27 +0000)]
Merge "Adds stripTrailingFs"
am:
27bb333e14
Change-Id: I355be2bb0b23e69103edc073ffe3adb757e57aa9
Treehugger Robot [Thu, 25 Jan 2018 03:09:27 +0000 (03:09 +0000)]
Merge "Add FLAG_ACTIVITY_NEW_TASK when starting UI-based tether provisioning."
Amit Mahajan [Thu, 25 Jan 2018 02:59:04 +0000 (02:59 +0000)]
Merge "Update comments for ACTION_CARRIER_CONFIG_CHANGED." am:
7b9a785d65
am:
e2075c2c7d
Change-Id: Ib3e807a900fcc548e88f10b4622e8203fe6d72be
Andreas Gampe [Thu, 25 Jan 2018 02:48:37 +0000 (02:48 +0000)]
Merge "BitmapDrawable: Suppress errorprone warning" am:
25e50ccccb
am:
822e828971
Change-Id: I0481e40c91e5848fc7ab551a794269d9379cbcc9
Treehugger Robot [Thu, 25 Jan 2018 02:44:26 +0000 (02:44 +0000)]
Merge "Adds stripTrailingFs"
Amit Mahajan [Thu, 25 Jan 2018 02:44:09 +0000 (02:44 +0000)]
Merge "Update comments for ACTION_CARRIER_CONFIG_CHANGED."
am:
7b9a785d65
Change-Id: I3f329aea9d90ced822c119f079d0a70a562f44a3
Andreas Gampe [Thu, 25 Jan 2018 02:40:28 +0000 (02:40 +0000)]
Merge "BitmapDrawable: Suppress errorprone warning"
am:
25e50ccccb
Change-Id: I085cfc11effb8f067bd8fc122ec88bd6c44a2525
Malcolm Chen [Wed, 24 Jan 2018 01:35:51 +0000 (17:35 -0800)]
Add slotId in INetworkService.aidl methods.
Since one Service can only return same binder to all connected
clients, we add slotId in INetworkService.aidl methods to redirect
requests to correct provider.
Bug:
64132030
Test: build
Change-Id: Iae5d81a689a43ed783d7dff0f51735c42a6483be
Treehugger Robot [Thu, 25 Jan 2018 01:33:33 +0000 (01:33 +0000)]
Merge "Update comments for ACTION_CARRIER_CONFIG_CHANGED."
David Brazdil [Thu, 25 Jan 2018 01:12:33 +0000 (01:12 +0000)]
Merge "Set Zygote.DISABLE_HIDDEN_API_CHECKS for system apps" am:
50cfaa40ca
am:
97a970e56b
Change-Id: I73eaa052597d225aa673dd479977b0ce7a7d6d64
Eric Schwarzenbach [Thu, 18 Jan 2018 22:42:00 +0000 (14:42 -0800)]
Add ServiceState APIs for carrier aggregation.
Adds getDuplexMode, getChannelNumber, and getCellBandwidths to
ServiceState.
Bug:
72117602
Test: runtest
Change-Id: I04be7d0a7d88693ef21b252ecc21aa974c2f89c8
David Brazdil [Thu, 25 Jan 2018 01:06:15 +0000 (01:06 +0000)]
Merge "Set Zygote.DISABLE_HIDDEN_API_CHECKS for system apps"
am:
50cfaa40ca
Change-Id: I7aa3c86bae54b4f55cbb5cfe8ddf076fedf6177b
Andreas Gampe [Thu, 25 Jan 2018 00:56:11 +0000 (00:56 +0000)]
Merge "BitmapDrawable: Suppress errorprone warning"
Jeremy Klein [Wed, 24 Jan 2018 23:34:38 +0000 (23:34 +0000)]
Merge "Add scan interval and window lengths to Settings.Global." am:
d3dac85e46
am:
8c33c789ed
Change-Id: Ib86750eadcf5683faba4151e3f3373f04a387de1
Holly Jiuyu Sun [Wed, 24 Jan 2018 23:24:29 +0000 (23:24 +0000)]
Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" am:
ec44a402d2
am:
596c22a84d
Change-Id: I6320f2195eeb2221fb29778b6171c3ebdb3f8dac
Pankaj Kanwar [Wed, 24 Jan 2018 23:14:30 +0000 (23:14 +0000)]
Merge "Metrics wifi.proto for connected wifi score" into oc-mr1-dev
am:
e2bc2efe3c
Change-Id: Ie1366ad3364176dce6a5f7b5a78a19b7806030cd
Jeremy Klein [Wed, 24 Jan 2018 23:13:31 +0000 (23:13 +0000)]
Merge "Add scan interval and window lengths to Settings.Global."
am:
d3dac85e46
Change-Id: Ibae30208c4f0f2ad8bf8e508778d73f0883ef42e
Treehugger Robot [Wed, 24 Jan 2018 23:09:28 +0000 (23:09 +0000)]
Merge "Set Zygote.DISABLE_HIDDEN_API_CHECKS for system apps"
Holly Jiuyu Sun [Wed, 24 Jan 2018 23:05:25 +0000 (23:05 +0000)]
Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."""
am:
ec44a402d2
Change-Id: I6ded59329716f073b30964940ab6574360406778
Pankaj Kanwar [Wed, 24 Jan 2018 23:02:22 +0000 (23:02 +0000)]
Merge "Metrics wifi.proto for connected wifi score" into oc-mr1-dev
Amit Mahajan [Wed, 24 Jan 2018 20:54:44 +0000 (12:54 -0800)]
Update comments for ACTION_CARRIER_CONFIG_CHANGED.
Test: none
Bug:
64131518
Change-Id: I7efbbb393289cc11d529898ea3d7f96b0e89f445
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, 24 Jan 2018 21:43:47 +0000 (21:43 +0000)]
Merge "Set DEXOPT_DISABLE_HIDDEN_API_CHECKS for system apps" am:
2a8c24be18
am:
6dea42ae0f
Change-Id: I6376e610c575cd7c3f7bf8a72ca4c1a92d9023cc
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
David Brazdil [Wed, 24 Jan 2018 21:36:44 +0000 (21:36 +0000)]
Merge "Set DEXOPT_DISABLE_HIDDEN_API_CHECKS for system apps"
am:
2a8c24be18
Change-Id: I51ce5aa51ca72200639244caa018323911cc54ae
Andreas Gampe [Wed, 24 Jan 2018 21:25:22 +0000 (13:25 -0800)]
BitmapDrawable: Suppress errorprone warning
Suppress a warning for constructor-chaining not using all parameters.
Bug:
72451126
Test: m javac-check RUN_ERROR_PRONE=true
Change-Id: Ie47dec119ec578b79d866d9c5041bb7b68eac146
Holly Jiuyu Sun [Wed, 24 Jan 2018 21:11:07 +0000 (21:11 +0000)]
Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."""
Tyler Gunn [Wed, 24 Jan 2018 21:06:48 +0000 (21:06 +0000)]
Merge "Add new IMS reasoninfo to handle alternate emergency disconnect scenario." am:
7a481bde6d
am:
f343e33dd5
Change-Id: Ia3e538e18d4fdf1770ee15b06d256c6e79051ebf
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
Tyler Gunn [Wed, 24 Jan 2018 20:48:55 +0000 (20:48 +0000)]
Merge "Add new IMS reasoninfo to handle alternate emergency disconnect scenario."
am:
7a481bde6d
Change-Id: I7d9f84b2240b1c961675b6ab6937dc952f44bd2d
David Brazdil [Mon, 22 Jan 2018 22:23:13 +0000 (22:23 +0000)]
Create hidden API lists
Android is beginning to put restrictions on the usage of private APIs.
In order to facilitate a transitionary period, some APIs will remain
accessible but issue a warning (greylist), other will see restrictions
right away (blacklist).
This patch create two new text files which will be used to store manual
lists of dex signatures of hidden APIs. These are the blacklist and
dark greylist. They should be mutually exclusive and both be subsets of
INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE. The last list, light greylist,
is generated as INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE minus the two
manual lists.
Bug:
64382372
Test: m
Change-Id: Ia694ef79bece819c87db853ccaea5e95f38d3e84
Xiangyu/Malcolm Chen [Wed, 24 Jan 2018 20:44:04 +0000 (20:44 +0000)]
Merge "Added network service interface"
am:
71793be6bb
Change-Id: I2dab9576e8fc32f914225620733ad83b7c808015
Jun Yin [Wed, 24 Jan 2018 20:13:37 +0000 (12:13 -0800)]
Adds stripTrailingFs
This function removes padding 'F' characters in a string (e.g., ICCID).
Bug:
38206971
Test: unit test in another cl
Change-Id: If77604576c5bd26404cdc436f8297191664325a4
Treehugger Robot [Wed, 24 Jan 2018 20:28:21 +0000 (20:28 +0000)]
Merge "Set DEXOPT_DISABLE_HIDDEN_API_CHECKS for system apps"
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
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
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"
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
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."
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 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