OSDN Git Service
Andreas Gampe [Mon, 22 Jan 2018 20:01:18 +0000 (20:01 +0000)]
Merge "Debug: Add attachJvmtiAgent with classloader" am:
940c0341f0
am:
878abd8e91
Change-Id: I862a822ef7600030f7b435fe9b9368961cf4694b
Benedict Wong [Mon, 22 Jan 2018 19:53:15 +0000 (19:53 +0000)]
Merge "Rename create/delete transform methods" am:
7ee26e72cf
am:
5b71c4a0a5
Change-Id: I16bfb511ac2d6094e246f79d51fe4520d3e765cd
Andreas Gampe [Mon, 22 Jan 2018 19:48:28 +0000 (19:48 +0000)]
Merge "Debug: Add attachJvmtiAgent with classloader"
am:
940c0341f0
Change-Id: I0c9179b373040e7d4f54a5ad9835d14624012999
Benedict Wong [Mon, 22 Jan 2018 19:44:43 +0000 (19:44 +0000)]
Merge "Rename create/delete transform methods"
am:
7ee26e72cf
Change-Id: I76576d1f3193fcbb3680fb29893cf696ea7a41fe
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"
Pavlin Radoslavov [Sun, 21 Jan 2018 00:33:40 +0000 (00:33 +0000)]
Merge "Multi-A2DP support - add a new internal API to suppress Audio Noisy intent" am:
7e3b1832c4
am:
5bd12d0bf4
Change-Id: I52b1adc5ce9f3dea56b0045581d7736cbe62de73
Pavlin Radoslavov [Sun, 21 Jan 2018 00:26:11 +0000 (00:26 +0000)]
Merge "Multi-A2DP support - add a new internal API to suppress Audio Noisy intent"
am:
7e3b1832c4
Change-Id: I4b75e8565dc0b80d6ca3825e87370a72c726bd25
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 11:33:16 +0000 (11:33 +0000)]
Merge "Generate new API signatures from doclava" am:
fa208b4226
am:
72b7f03179
Change-Id: I7dbf94c493bc79f4200afc45e6ed58543359c9ff
David Brazdil [Sat, 20 Jan 2018 11:23:49 +0000 (11:23 +0000)]
Merge "Generate new API signatures from doclava"
am:
fa208b4226
Change-Id: Iae4cc67435b84c868a446dc7ac16a618656bbdbb
David Brazdil [Sat, 20 Jan 2018 10:06:22 +0000 (10:06 +0000)]
Merge "Generate new API signatures from doclava"
yinxu [Sat, 20 Jan 2018 09:56:08 +0000 (09:56 +0000)]
Merge "Add CARD_ID in SubscriptionInfo database" am:
6745e15d17
am:
33de998afe
Change-Id: I63246ba54d112ef75ca6989c16d7ae979bde552a
yinxu [Sat, 20 Jan 2018 09:47:20 +0000 (09:47 +0000)]
Merge "Add CARD_ID in SubscriptionInfo database"
am:
6745e15d17
Change-Id: I3df57fc50d9e928d74c50b2b99fde63e757e7e78
Treehugger Robot [Sat, 20 Jan 2018 08:28:24 +0000 (08:28 +0000)]
Merge "Add CARD_ID in SubscriptionInfo database"
Jordan Liu [Fri, 19 Jan 2018 21:36:06 +0000 (21:36 +0000)]
Merge "Make LTE signal bar thresholds customizable with carrier configuration" am:
8fb3bdc36f
am:
5d90d0e2b7
Change-Id: Ia3fe7265126023ec8c2ba5aaa6d09cd1ed1e9c43
Jordan Liu [Fri, 19 Jan 2018 21:29:10 +0000 (21:29 +0000)]
Merge "Make LTE signal bar thresholds customizable with carrier configuration"
am:
8fb3bdc36f
Change-Id: Icf95b62e2828de2175b2c9767741138c507c0e5b
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 20:16:38 +0000 (20:16 +0000)]
Merge "Add Tunnel Interface APIs to IpSecManager" am:
08d07aec50
am:
696cff166c
Change-Id: I0cd07c51e9512b7e9471e1a09c977fca2bf12e48
nharold [Fri, 19 Jan 2018 20:08:38 +0000 (20:08 +0000)]
Merge "Add Tunnel Interface APIs to IpSecManager"
am:
08d07aec50
Change-Id: I4186bdf52cc1c2c8927ca1a0dd61b71fae236e1a
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
Lorenzo Colitti [Fri, 19 Jan 2018 16:37:44 +0000 (16:37 +0000)]
Merge changes Id8776d14,Ifa291c62,I5ea9d200 am:
c48f4cb7f1
am:
b36b423230
Change-Id: I1ac9d349850d607c5fbf4a47760bc09de1c18043
Lorenzo Colitti [Fri, 19 Jan 2018 16:30:17 +0000 (16:30 +0000)]
Merge changes Id8776d14,Ifa291c62,I5ea9d200
am:
c48f4cb7f1
Change-Id: I7a0b01cba8bdee67cffabddacb4ff5f4591cbc34
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
Amit Mahajan [Fri, 19 Jan 2018 07:54:45 +0000 (07:54 +0000)]
Merge "Added new SIM state related broadcasts." am:
0fc9900802
am:
6ada16b386
Change-Id: Id2b6996e712675b387d0f6b89043b02f39fb1af9
Amit Mahajan [Fri, 19 Jan 2018 07:47:21 +0000 (07:47 +0000)]
Merge "Added new SIM state related broadcasts."
am:
0fc9900802
Change-Id: I10b5f7a9307012e1097712acd36a91c5f6969c11
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."
Ian Pedowitz [Fri, 19 Jan 2018 04:21:35 +0000 (04:21 +0000)]
Merge "Fixing app compat issue b/
72143978" am:
8353a39ecc
am:
61bab24fa8
Change-Id: I6f07f1d9cfd26aa8b93a2563349b5e40effb7a41
Ian Pedowitz [Fri, 19 Jan 2018 04:13:00 +0000 (04:13 +0000)]
Merge "Fixing app compat issue b/
72143978"
am:
8353a39ecc
Change-Id: I4ca60a29aec20f08c65d85b03a080a19d03c7345
Steven Moreland [Fri, 19 Jan 2018 03:21:45 +0000 (03:21 +0000)]
Merge "HIDL: Check error value." am:
898137f817
am:
74426e9c2d
Change-Id: Iadcd6a9264e0771aa6d9fe62cca221f2391f2d12
Steven Moreland [Fri, 19 Jan 2018 03:15:30 +0000 (03:15 +0000)]
Merge "HIDL: Check error value."
am:
898137f817
Change-Id: I838c21cc0c423d41e980a360967a2773238dff81
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."
Jeff Sharkey [Fri, 19 Jan 2018 01:11:41 +0000 (01:11 +0000)]
Merge "Add ability to override subscriber capabilities." am:
d6cd4b241a
am:
5e097d452b
Change-Id: Ib22d57c7cde75560cfd5bdd71b75d29b1056f783
Jeff Sharkey [Fri, 19 Jan 2018 01:04:32 +0000 (01:04 +0000)]
Merge "Add ability to override subscriber capabilities."
am:
d6cd4b241a
Change-Id: Id035d437e9b297ba70ba9231f6cfdd44e5b9c257
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
Dan Zhang [Fri, 19 Jan 2018 00:05:48 +0000 (00:05 +0000)]
Merge "Fix <Report Audio Status> update" am:
1d5e2c3c37
am:
e7aaba48de
Change-Id: I6f7314a01386aff883992d7f4b32bb9bb0500555
Dan Zhang [Thu, 18 Jan 2018 23:59:12 +0000 (23:59 +0000)]
Merge "Fix <Report Audio Status> update"
am:
1d5e2c3c37
Change-Id: Iac3e1fe3f93c376ccc35e29d611067fb0ad8a8fc
Jeff Sharkey [Thu, 18 Jan 2018 23:58:30 +0000 (23:58 +0000)]
Merge "Add ability to override subscriber capabilities."
Dan Zhang [Thu, 18 Jan 2018 23:20:44 +0000 (23:20 +0000)]
Merge "Fix OTP performance with no Vendor ID device" am:
6ecaac4c9f
am:
b88d9b4593
Change-Id: Iaaa8b0ebfa73f5567dc4dfc84d23ed47bb0c3827
Dan Zhang [Thu, 18 Jan 2018 23:16:49 +0000 (23:16 +0000)]
Merge "Fix NPE by pressing Volume Up/Down" am:
fca5ee0bb8
am:
bd57a4d8a1
Change-Id: I23595e55b5c38cecb39272f7c739c27abe1eddb3
Dan Zhang [Thu, 18 Jan 2018 23:10:01 +0000 (23:10 +0000)]
Merge "Fix illegal volume value issue" am:
20443a8dbb
am:
65dd4cbf32
Change-Id: I2ab3578a84ed128e60b2c0329db0ed77af331bba
Dan Zhang [Thu, 18 Jan 2018 23:09:43 +0000 (23:09 +0000)]
Merge "Fix OTP performance with no Vendor ID device"
am:
6ecaac4c9f
Change-Id: I776ac55ca48cb9d463f4abe087c71b362ce5327d
Dan Zhang [Thu, 18 Jan 2018 23:06:49 +0000 (23:06 +0000)]
Merge "Fix NPE by pressing Volume Up/Down"
am:
fca5ee0bb8
Change-Id: I2f35ed23478b10339a9924593411e02da77207ec
Dan Zhang [Thu, 18 Jan 2018 23:03:28 +0000 (23:03 +0000)]
Merge "Fix illegal volume value issue"
am:
20443a8dbb
Change-Id: I94140f9e65e74df17053aa8824569ed8df2637a1
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 21:19:41 +0000 (21:19 +0000)]
Merge "Add config_supportBluetoothPersistedState." am:
524fe66549
am:
171b8f366a
Change-Id: If1f43a76c6ade2dd2ba82f0057aa528d4624981c
Arthur Hsu [Thu, 18 Jan 2018 21:12:08 +0000 (21:12 +0000)]
Merge "Add config_supportBluetoothPersistedState."
am:
524fe66549
Change-Id: I17c56fa8a5b5a984e26591d1e0e830a1c54fa28e
Arthur Hsu [Thu, 18 Jan 2018 19:38:32 +0000 (19:38 +0000)]
Merge "Add config_supportBluetoothPersistedState."
Arthur Hsu [Thu, 11 Jan 2018 19:05:11 +0000 (11:05 -0800)]
Add config_supportBluetoothPersistedState.
Add a config to indicate whether a device supports Bluetooth persisted
state and defaulted to true. In ARC++, Bluetooth adapter state can be
out-of-sync from its container if the user changes it before the
container being available.
When set to false, this config prevents Android to auto start the
Bluetooth. ARC++ will set this to false and sync Bluetooth state later
with Android.
Related CL is ag/931281
Bug:
62413625,
69965109
Test: On sailfish, Bluetooth on/off correctly and state persisted across reboot
Change-Id: Ie298929eb6b882108a12e8b95f61e3c9f8eb63ea
Stanley Tng [Thu, 18 Jan 2018 18:08:37 +0000 (18:08 +0000)]
Merge "Added APIs for Connection-oriented channels" am:
e1992384e0
am:
288915bedc
Change-Id: Iaf2aa40e8e6e2621c146fcabe0f46c3dd1bfedc4
Stanley Tng [Thu, 18 Jan 2018 17:59:19 +0000 (17:59 +0000)]
Merge "Added APIs for Connection-oriented channels"
am:
e1992384e0
Change-Id: If7cb99a59aee8640f6dddd96f2388e2a5284df45
Treehugger Robot [Thu, 18 Jan 2018 16:42:33 +0000 (16:42 +0000)]
Merge "Added APIs for Connection-oriented channels"
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 10:31:35 +0000 (10:31 +0000)]
Merge "Javadoc fixes to Time" am:
b3c2efc615
am:
b51c638a6c
Change-Id: Ifea3eb9d25754155681b1f74096eacac1fa0b259
Neil Fuller [Thu, 18 Jan 2018 10:26:13 +0000 (10:26 +0000)]
Merge "Javadoc fixes to Time"
am:
b3c2efc615
Change-Id: I9793670f518d15fc42caa01a519c33e451998a77
Neil Fuller [Thu, 18 Jan 2018 09:18:27 +0000 (09:18 +0000)]
Merge "Javadoc fixes to Time"
Holly Jiuyu Sun [Thu, 18 Jan 2018 04:14:54 +0000 (04:14 +0000)]
Merge "Add APIs to EuiccCardManager." am:
a5bc474e2c
am:
f07319a6df
Change-Id: I71b5ea764f306a8a852f08a99f6a7247109e3511
Jeff Sharkey [Thu, 18 Jan 2018 04:10:00 +0000 (04:10 +0000)]
Merge "Add "not congested" network capability." am:
ffaddf73de
am:
abb158f712
Change-Id: I2c7276bd657f5805c0b6492a216435270023a3c6
Erik Kline [Thu, 18 Jan 2018 04:02:46 +0000 (04:02 +0000)]
Merge "Add basic resolution of Private DNS hostname" am:
a3bf36f050
am:
4218c522a7
Change-Id: Ifc776c67025925fbeb2c13038ae78061c32567f5
Holly Jiuyu Sun [Thu, 18 Jan 2018 04:01:59 +0000 (04:01 +0000)]
Merge "Add APIs to EuiccCardManager."
am:
a5bc474e2c
Change-Id: Ib0653ef73bb59f5dba2396bde20d1f29b107da86
Jeff Sharkey [Thu, 18 Jan 2018 03:58:13 +0000 (03:58 +0000)]
Merge "Add "not congested" network capability."
am:
ffaddf73de
Change-Id: I02ea25610df63b40547c3114c0f9a9ef59560e90
Erik Kline [Thu, 18 Jan 2018 03:54:50 +0000 (03:54 +0000)]
Merge "Add basic resolution of Private DNS hostname"
am:
a3bf36f050
Change-Id: I9ce3476d80b05c140a02aaf1c21d4da2a68a8909
Holly Jiuyu Sun [Thu, 18 Jan 2018 03:32:22 +0000 (03:32 +0000)]
Merge "Add APIs to EuiccCardManager."
Jeff Sharkey [Thu, 18 Jan 2018 03:28:34 +0000 (03:28 +0000)]
Merge "Add "not congested" network capability."
Lorenzo Colitti [Thu, 18 Jan 2018 03:27:51 +0000 (03:27 +0000)]
Merge "Add public API methods for private DNS." am:
aacb56a7c0
am:
f193c6d37d
Change-Id: I8d5a5b72c128231cca1dfb00bc00e887b5fbfc53
Lorenzo Colitti [Thu, 18 Jan 2018 03:21:02 +0000 (03:21 +0000)]
Merge "Add public API methods for private DNS."
am:
aacb56a7c0
Change-Id: If2bdfb05fcb235888bf272e4cfddb14619fc3f78
Treehugger Robot [Thu, 18 Jan 2018 02:44:53 +0000 (02:44 +0000)]
Merge "Add basic resolution of Private DNS hostname"
Pavlin Radoslavov [Thu, 18 Jan 2018 02:18:03 +0000 (02:18 +0000)]
Merge "Added internal API getMaxConnectedAudioDevices()" am:
877cbe1dc2
am:
18606e1601
Change-Id: I58199a6c70bfa03fc515c573b936c78ec34d61ac
Pavlin Radoslavov [Thu, 18 Jan 2018 02:10:31 +0000 (02:10 +0000)]
Merge "Added internal API getMaxConnectedAudioDevices()"
am:
877cbe1dc2
Change-Id: Ifb7b28f3993e3d8967886bdff006bcd2679d3277
Victor Hsieh [Thu, 18 Jan 2018 01:23:32 +0000 (01:23 +0000)]
Merge "Reland: Move zygote's seccomp setup to post-fork" am:
7839672e22
am:
4249466562
Change-Id: Idbf4d7add5e41d2d01f4a3c2ff6e8f1b1735faeb
Lorenzo Colitti [Thu, 18 Jan 2018 01:17:17 +0000 (01:17 +0000)]
Merge "Add public API methods for private DNS."
Victor Hsieh [Thu, 18 Jan 2018 01:15:05 +0000 (01:15 +0000)]
Merge "Reland: Move zygote's seccomp setup to post-fork"
am:
7839672e22
Change-Id: I93275a50938ed1514fc690fe2e1390054748d361
Joseph Pirozzo [Thu, 18 Jan 2018 01:09:30 +0000 (01:09 +0000)]
Merge "Bluetooth in band ring" am:
dbfaf31357
am:
8c73ee91f5
Change-Id: I1972da1da7bc0c001dc4525858bdb0e8bd5dd530
Joseph Pirozzo [Thu, 18 Jan 2018 01:02:14 +0000 (01:02 +0000)]
Merge "Bluetooth in band ring"
am:
dbfaf31357
Change-Id: I24b9169afc67e376a22c99f8a1ae7117549401f8
Treehugger Robot [Thu, 18 Jan 2018 00:46:57 +0000 (00:46 +0000)]
Merge "Added internal API getMaxConnectedAudioDevices()"
Holly Jiuyu Sun [Fri, 22 Dec 2017 02:44:59 +0000 (18:44 -0800)]
Add APIs to EuiccCardManager.
The CL contains parts of the EuiccCard APIs. getEid() is sync. All the
other APIs are async.
Move ResetOptions from EuiccCard to EuiccCardManager.
The other APIs will be added in a follow-up CL.
Bug:
38206971
Test: test on phone
Change-Id: Iba098ee779b8ea4e244e0e4cf7318139666cc94b
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
Andy Hung [Thu, 18 Jan 2018 00:02:14 +0000 (00:02 +0000)]
Merge "Watchdog: add media.metrics" am:
6cb33a1b54
am:
701c4cd1cc
Change-Id: If5fb8cfe18e7fad089b5aec8e3168dab940826ec
Treehugger Robot [Wed, 17 Jan 2018 23:58:10 +0000 (23:58 +0000)]
Merge "Reland: Move zygote's seccomp setup to post-fork"
Andy Hung [Wed, 17 Jan 2018 23:55:25 +0000 (23:55 +0000)]
Merge "Watchdog: add media.metrics"
am:
6cb33a1b54
Change-Id: I24992a0a7e4e4a67fba1c5202fc4e741a3952794
Treehugger Robot [Wed, 17 Jan 2018 23:48:40 +0000 (23:48 +0000)]
Merge "Bluetooth in band ring"
Holly Jiuyu Sun [Wed, 17 Jan 2018 23:25:13 +0000 (23:25 +0000)]
Merge "Add APIs to EuiccCardManager and EuiccCardController." am:
0797f4be58
am:
f09db036e5
Change-Id: Ifcd39da6aafb4cd1e0b6e9e1baa38342a590fb91
Jack Yu [Wed, 17 Jan 2018 23:18:21 +0000 (23:18 +0000)]
Merge "Added data service interface" am:
3965e3bbc6
am:
5f12e2c76d
Change-Id: Iac4b6e1b86cdfa2e3285a086220b7c7aa921d7ff
Brad Ebinger [Wed, 17 Jan 2018 23:13:46 +0000 (23:13 +0000)]
Merge "Integrate IMS Registration API" am:
1f00565433
am:
f4d3a4d110
Change-Id: I19e812368d0afd5bd7934b4e3a2aa575d0c1d3a3
Holly Jiuyu Sun [Wed, 17 Jan 2018 23:07:54 +0000 (23:07 +0000)]
Merge "Add APIs to EuiccCardManager and EuiccCardController."
am:
0797f4be58
Change-Id: Ie96bf09b698718705971bd94cd44f55e74700223
yuemingw [Wed, 17 Jan 2018 23:05:16 +0000 (23:05 +0000)]
Merge "Add URL_DPC, URL_FILTERED and URL_ENFORCE_MANAGED as constants." am:
b760295764
am:
10f60a740f
Change-Id: I7e00f153a147c906fe853c1f98e492a0c381850a
Jack Yu [Wed, 17 Jan 2018 23:04:57 +0000 (23:04 +0000)]
Merge "Added data service interface"
am:
3965e3bbc6
Change-Id: I7543aff2abadb4c6b2556f37cd5e763cb5a8c08c