OSDN Git Service
Brad Ebinger [Fri, 22 Mar 2019 00:44:07 +0000 (17:44 -0700)]
Merge "Fix build due to no explanatory comment."
am:
0b6c77167e
Change-Id: Icc0a8be233ab0a5f5f86541b452ae82e6415fd4c
Lorenzo Colitti [Fri, 22 Mar 2019 00:39:56 +0000 (17:39 -0700)]
Merge changes I2e8c2ad9,Ic4f4c7d2
am:
0c089bcc82
Change-Id: I09d0c721fc8d9755b9310bbe252aa45ab9f147f2
Brad Ebinger [Fri, 22 Mar 2019 00:25:11 +0000 (00:25 +0000)]
Merge "Fix build due to no explanatory comment."
Lorenzo Colitti [Fri, 22 Mar 2019 00:23:22 +0000 (00:23 +0000)]
Merge changes I2e8c2ad9,Ic4f4c7d2
* changes:
Move the networkstack AIDL interfaces to services/net.
Remove the framework dependency on networkstack-aidl-framework.
Patrick Huang [Thu, 21 Mar 2019 23:51:05 +0000 (16:51 -0700)]
Merge "Add "from" extra for ACTION_TOGGLE_SUBSCRIPTION_PRIVILEGED"
am:
9a1888ce62
Change-Id: I342884174fbaaa13b0973038f6cb70258ba436d7
Holly Jiuyu Sun [Thu, 21 Mar 2019 23:43:11 +0000 (16:43 -0700)]
Merge "Fix the assumption in GetEuiccProfileInfoListResult."
am:
ee7a7f63a9
Change-Id: I13835ff69637a5e8acb09191a2c0f9067b0688d8
Nathan Harold [Thu, 21 Mar 2019 23:35:46 +0000 (16:35 -0700)]
Merge "Expose CellInfoTdscdma"
am:
0b88e07ea5
Change-Id: I6ec42e526ba4a26f26b263c9ab7d83a10a476e97
Treehugger Robot [Thu, 21 Mar 2019 23:35:39 +0000 (23:35 +0000)]
Merge "Add "from" extra for ACTION_TOGGLE_SUBSCRIPTION_PRIVILEGED"
Treehugger Robot [Thu, 21 Mar 2019 23:35:31 +0000 (23:35 +0000)]
Merge "Fix the assumption in GetEuiccProfileInfoListResult."
Nathan Harold [Thu, 21 Mar 2019 23:19:43 +0000 (23:19 +0000)]
Merge "Expose CellInfoTdscdma"
Brad Ebinger [Thu, 21 Mar 2019 22:22:16 +0000 (15:22 -0700)]
Fix build due to no explanatory comment.
Test: manual build
Change-Id: Ibfb3a114c74d673eb94dd2fa1fc9b9918283e9db
Holly Jiuyu Sun [Wed, 20 Mar 2019 22:41:22 +0000 (15:41 -0700)]
Fix the assumption in GetEuiccProfileInfoListResult.
Under error cases, LPA can return a GetEuiccProfileInfoListResult
with either null profiles or empty profiles.
Bug:
127376266
Test: build
Change-Id: Id29c8f00183660d2195c58c96eb4154454623eb6
Merged-In: Id29c8f00183660d2195c58c96eb4154454623eb6
Brad Ebinger [Thu, 21 Mar 2019 21:58:24 +0000 (14:58 -0700)]
Merge "Deprecate SystemApi that was accidently made public in P"
am:
18870b2e4e
Change-Id: I235d5466ac67e60d4cf59c28131c30421fbfd18c
Treehugger Robot [Thu, 21 Mar 2019 21:46:25 +0000 (21:46 +0000)]
Merge "Deprecate SystemApi that was accidently made public in P"
Michele Berionne [Thu, 21 Mar 2019 19:07:24 +0000 (12:07 -0700)]
Merge "Modified MultiSim APIs"
am:
c5461c4490
Change-Id: I12da49b887202f340be7f1a290bdc8c99863eac0
Michele Berionne [Thu, 21 Mar 2019 18:53:11 +0000 (18:53 +0000)]
Merge "Modified MultiSim APIs"
Patrick Huang [Tue, 19 Mar 2019 21:58:51 +0000 (14:58 -0700)]
Add "from" extra for ACTION_TOGGLE_SUBSCRIPTION_PRIVILEGED
Bug:
126242076
Test: Test on phone to ensure the extra is received by LPA
Change-Id: I1367fa988dbc71eb30631ebf9903309eba3ef96d
Merged-In: I1367fa988dbc71eb30631ebf9903309eba3ef96d
Neil Fuller [Thu, 21 Mar 2019 17:59:49 +0000 (10:59 -0700)]
Merge "Require the ANDROID_TZDATA_ROOT env var"
am:
f6c4aa1f67
Change-Id: Ic307cf7c3e648f37170834c1b265761de4d77b6b
Jordan Liu [Thu, 21 Mar 2019 17:55:23 +0000 (10:55 -0700)]
Merge "Update documentation"
am:
ae25b62203
Change-Id: Idbe416dbd182eea082c67de330f38f3696f81b11
Paul Hu [Thu, 21 Mar 2019 17:46:03 +0000 (10:46 -0700)]
Merge "Fix Automated API Review issues."
am:
43c1ade661
Change-Id: I9c007c129269a80d9aede31c8980dbd42e9f1f84
Neil Fuller [Thu, 21 Mar 2019 17:43:45 +0000 (17:43 +0000)]
Merge "Require the ANDROID_TZDATA_ROOT env var"
Jordan Liu [Thu, 21 Mar 2019 17:36:14 +0000 (17:36 +0000)]
Merge "Update documentation"
Paul Hu [Thu, 21 Mar 2019 17:19:26 +0000 (17:19 +0000)]
Merge "Fix Automated API Review issues."
lucaslin [Thu, 21 Mar 2019 15:19:47 +0000 (08:19 -0700)]
Merge "Temporarily disable flaky test."
am:
775d11c988
Change-Id: I3f2f81a6884ba1ffc212c4da393846a597af831b
Treehugger Robot [Thu, 21 Mar 2019 15:04:15 +0000 (15:04 +0000)]
Merge "Temporarily disable flaky test."
Paul Hu [Thu, 21 Mar 2019 14:24:16 +0000 (07:24 -0700)]
Merge "Fix Automated API Review issues."
am:
814bb8f627
Change-Id: I9cbe7dc166ec066b8785553f31dc32ea0572be8e
Lorenzo Colitti [Tue, 19 Mar 2019 07:11:26 +0000 (16:11 +0900)]
Move the networkstack AIDL interfaces to services/net.
Nothing in the framework uses these, so there is no point in
having the build be in frameworks/base/Android.bp.
Fix:
128804404
Test: builds, boots
Test: atest FrameworksNetTests
Change-Id: I2e8c2ad9ea8bfcd3668a83e4c044de10389a8a22
Lorenzo Colitti [Wed, 20 Mar 2019 12:57:20 +0000 (21:57 +0900)]
Remove the framework dependency on networkstack-aidl-framework.
This dependency is unused because the only file it contains is
only used by services.net, which already depends on it via the
networkstack-aidl-interfaces rule.
In its own change because it conflicts in internal master.
Test: m
Bug:
128804404
Change-Id: Ic4f4c7d2f7de06f75344946345684f26f1e05932
Merged-In: Ic4f4c7d2f7de06f75344946345684f26f1e05932
Paul Hu [Thu, 21 Mar 2019 14:11:36 +0000 (14:11 +0000)]
Merge "Fix Automated API Review issues."
Remi NGUYEN VAN [Thu, 21 Mar 2019 14:09:14 +0000 (07:09 -0700)]
Merge "Define DhcpErrorEvent constants at compile time"
am:
5803191975
Change-Id: I6ccc8d92c5742422fc29da1fe15d6108d036b72f
Remi NGUYEN VAN [Thu, 21 Mar 2019 13:57:18 +0000 (13:57 +0000)]
Merge "Define DhcpErrorEvent constants at compile time"
Mark Chien [Thu, 21 Mar 2019 12:14:45 +0000 (05:14 -0700)]
Merge "Replace TcpSocketInfo with similar structure"
am:
a34aa2acab
Change-Id: I6e3f89a910fc3ab7524da1c5c5b525a72191a4ed
Mark Chien [Thu, 21 Mar 2019 12:02:54 +0000 (12:02 +0000)]
Merge "Replace TcpSocketInfo with similar structure"
lucaslin [Thu, 21 Mar 2019 11:14:32 +0000 (19:14 +0800)]
Temporarily disable flaky test.
Test: None
Bug:
128426024
Change-Id: I6fa12e50decbafe9d934030865c5a8f20d42b86f
Colin Cross [Thu, 21 Mar 2019 08:23:40 +0000 (01:23 -0700)]
Merge "Fix ODR issue in viewcompiler"
am:
b9879d00c4
Change-Id: I2fda6bdf7ebc082a732d75d55694d47f5a755fdc
Treehugger Robot [Thu, 21 Mar 2019 08:06:00 +0000 (08:06 +0000)]
Merge "Fix ODR issue in viewcompiler"
Mark Chien [Thu, 21 Mar 2019 07:18:11 +0000 (00:18 -0700)]
Merge "Restrict scope of switch Repair Mode"
am:
21caf8d65e
Change-Id: Ie655ad82d0441aa6ad6fc45a6e63dc2a53338148
paulhu [Fri, 15 Mar 2019 09:17:02 +0000 (17:17 +0800)]
Fix Automated API Review issues.
These API's argument/return value must be marked either @NonNull
or @Nullable.
Bug:
126701148
Bug:
126699090
Bug:
126701058
Bug:
126700772
Bug:
126699941
Bug:
126701299
Bug:
126700007
Bug:
126700900
Test: atest FrameworksNetTests
Change-Id: Id030a9f1116178b96aa3d4614b10969a537b2fc4
Mark Chien [Thu, 21 Mar 2019 07:02:14 +0000 (07:02 +0000)]
Merge "Restrict scope of switch Repair Mode"
Luke Huang [Thu, 21 Mar 2019 06:18:25 +0000 (23:18 -0700)]
Merge "Cleanup NetworkManagementService for Netd commnads binder migrartion"
am:
3af01e2f46
Change-Id: I86ca4cab29099b26f797ef6fce94dbb6f5183b90
Michele [Tue, 19 Mar 2019 20:47:11 +0000 (13:47 -0700)]
Modified MultiSim APIs
Capitalize S in Multisim.
isMultiSimSupported should return three states, to describe the three possible cases
(hardware not supported, hardware supported but carrier restricted, available)
Bug:
128524079
Test: compilation
Change-Id: Icbd36f714c577a965d39336d54d7224c8c2c7cd2
Merged-In: Icbd36f714c577a965d39336d54d7224c8c2c7cd2
Luke Huang [Thu, 21 Mar 2019 06:01:25 +0000 (06:01 +0000)]
Merge "Cleanup NetworkManagementService for Netd commnads binder migrartion"
paulhu [Fri, 8 Mar 2019 08:35:20 +0000 (16:35 +0800)]
Fix Automated API Review issues.
1. Some API's argument/return value must be marked either
@NonNull or @Nullable.
2. Change some system APIs to public APIs.
3. Modify the method name
Bug:
126700123
Bug:
126702339
Bug:
126699682
Bug:
118296575
Bug:
126699216
Bug:
126699675
Bug:
126699429
Bug:
126699193
Bug:
123586045
Test: atest FrameworksNetTests
Change-Id: Iaa2832cdcf83758ed0fec81b954a0c63bc5a7bf6
Colin Cross [Thu, 21 Mar 2019 04:13:33 +0000 (21:13 -0700)]
Fix ODR issue in viewcompiler
libz is already linked as a static library through
libdexfile_static_defaults, don't also link it as a shared library.
Fixes:
=================================================================
==43189==ERROR: AddressSanitizer: odr-violation (0x55d1ed723a60):
[1] size=48 'inflate_copyright' external/zlib/src/inftrees.c:11:12
[2] size=48 'inflate_copyright' external/zlib/src/inftrees.c:11:12
These globals were registered at these points:
[1]:
#0 0x55d1ed769a0e (/buildbot/src/android/master/out/soong/host/linux-x86/bin/viewcompiler+0xf3a0e)
#1 0x55d1ed991b1b (/buildbot/src/android/master/out/soong/host/linux-x86/bin/viewcompiler+0x31bb1b)
[2]:
#0 0x55d1ed769a0e (/buildbot/src/android/master/out/soong/host/linux-x86/bin/viewcompiler+0xf3a0e)
#1 0x7f5dff20a09b (/buildbot/src/android/master/out/soong/host/linux-x86/bin/../lib64/libz-host.so+0x3e09b)
Test: m SANITIZE_HOST=address viewcompiler && viewcompiler
Change-Id: I4ebdf7ef4ec1641488fbc25275dbf6aa0cdbe2eb
Lucas Lin [Thu, 21 Mar 2019 03:45:42 +0000 (20:45 -0700)]
Merge "Improve partial connectivity"
am:
f6cbc2d533
Change-Id: I19c41c88d32643f82531c7afc3d4248ef9b44b53
Lucas Lin [Thu, 21 Mar 2019 03:34:30 +0000 (03:34 +0000)]
Merge "Improve partial connectivity"
Patrick Huang [Thu, 21 Mar 2019 02:22:35 +0000 (19:22 -0700)]
Merge "Document type of euicc privileged action extras."
am:
4bcdd78d56
Change-Id: I7a3c7f596e8b17aa4c16663bbd652229c5315353
Patrick Huang [Thu, 21 Mar 2019 02:09:20 +0000 (02:09 +0000)]
Merge "Document type of euicc privileged action extras."
Patrick Huang [Thu, 21 Mar 2019 01:52:41 +0000 (18:52 -0700)]
Merge "Document permissions for euicc privileged actions."
am:
7e2e333769
Change-Id: Ief36f070adf466447ec676487817f21d550b5527
Treehugger Robot [Thu, 21 Mar 2019 01:41:23 +0000 (01:41 +0000)]
Merge "Document permissions for euicc privileged actions."
Nathan Harold [Tue, 19 Mar 2019 20:20:17 +0000 (13:20 -0700)]
Expose CellInfoTdscdma
Expose CellInfoTdscdma and CellSignalStrengthTdscdma
which are both returned by existing public APIs.
This corrects an oversight whereby the values returned
by the public API could not be used by callers.
Existing CTS tests already validate these structures as
though they were public (which was the intention).
Note, this was also requested as feedback in the public
beta.
Bug:
128880490
Test: cts - atest CellInfoTest; atest SignalStrengthTest
Merged-In: Ia75ea9af52796729e26b85ca04fd97b6c9b80f8e
Change-Id: Ia75ea9af52796729e26b85ca04fd97b6c9b80f8e
Jack He [Thu, 21 Mar 2019 00:46:19 +0000 (17:46 -0700)]
Merge "Bluetooth: Add event_value to BluetoothClassicPairingEventReported"
am:
9c7fb4566d
Change-Id: I7142e2c751b014662ab4af5e2d516a96ee034725
Howard Chen [Thu, 21 Mar 2019 00:40:44 +0000 (17:40 -0700)]
Merge "Support starting gsid lazily"
am:
4108388601
Change-Id: I5f6a9e3492cf41c2681297ce770310cda862de3d
Treehugger Robot [Thu, 21 Mar 2019 00:33:08 +0000 (00:33 +0000)]
Merge "Bluetooth: Add event_value to BluetoothClassicPairingEventReported"
Colin Cross [Thu, 21 Mar 2019 00:31:27 +0000 (17:31 -0700)]
Merge "Dist aapt2 protos"
am:
b602193169
Change-Id: I07d5c0307cf8faa03f0869e78b3a548f171ad6b0
Howard Chen [Thu, 21 Mar 2019 00:28:31 +0000 (00:28 +0000)]
Merge "Support starting gsid lazily"
Treehugger Robot [Thu, 21 Mar 2019 00:07:21 +0000 (00:07 +0000)]
Merge "Dist aapt2 protos"
Jack Yu [Wed, 20 Mar 2019 23:36:19 +0000 (16:36 -0700)]
Merge "API review feedback changes"
am:
84ea11384d
Change-Id: I37c4f558d313d3ea7f201633273dc53f6ffd128c
Treehugger Robot [Wed, 20 Mar 2019 23:22:20 +0000 (23:22 +0000)]
Merge "API review feedback changes"
Patrick Huang [Mon, 18 Mar 2019 22:56:39 +0000 (15:56 -0700)]
Document type of euicc privileged action extras.
Bug:
128317614
Test: Test on phone
Change-Id: Ib7978807376c7987d3aa8a7e3d1dc4bc6c814c6a
Merged-In: Ib7978807376c7987d3aa8a7e3d1dc4bc6c814c6a
Shuo Qian [Wed, 20 Mar 2019 22:57:24 +0000 (15:57 -0700)]
Merge "Add Prefix per Carrier requirement"
am:
592e9abb0b
Change-Id: I84cae8e10cd495d2504f6dddba0f622b8c3b49a0
Shuo Qian [Wed, 20 Mar 2019 22:44:59 +0000 (22:44 +0000)]
Merge "Add Prefix per Carrier requirement"
Patrick Huang [Fri, 15 Mar 2019 02:25:47 +0000 (19:25 -0700)]
Document permissions for euicc privileged actions.
Bug:
128317064
Test: Test on phone
Change-Id: I285597e48e97f1b4ffe4b4eb4ac68010905f4e1f
Merged-In: I285597e48e97f1b4ffe4b4eb4ac68010905f4e1f
sqian [Wed, 20 Mar 2019 21:16:14 +0000 (14:16 -0700)]
Add Prefix per Carrier requirement
Some carrier requires if users dial an emergency number address with
some prefix, the combination of the prefix and the address is also a
valid emergency number to dial.
Bug:
122429213
Test: Treehugger
Change-Id: Ib9b96bb0a210aba64a8652984d22f3564813fa9d
Merged-In: Ib9b96bb0a210aba64a8652984d22f3564813fa9d
(cherry picked from commit
69f48c5e906512bf9ac56b315daa6d4dfdfb7600)
Jack Yu [Sun, 17 Mar 2019 06:00:35 +0000 (23:00 -0700)]
API review feedback changes
Made the follwing changes based on API council review
feedback
1. Made the class and its Builder class final
2. Removed methods that should not be in the builder
3. Changed the return type of available services
from array to list.
Test: Unit tests
Bug
127657991
Merged-In: I3c2d406fed3ddaf62dee193c7657caf8c5bc13d2
Change-Id: I3c2d406fed3ddaf62dee193c7657caf8c5bc13d2
(cherry picked from commit
20d71403b8a1950bb44ee183138dc7a83c673472)
Brad Ebinger [Wed, 20 Mar 2019 20:29:07 +0000 (13:29 -0700)]
Merge "Make ImsException final"
am:
cdc0da732d
Change-Id: Ic2aafb555b69398852409fc80f6ace5f0f92d1dc
Jordan Liu [Wed, 20 Mar 2019 20:02:24 +0000 (13:02 -0700)]
Update documentation
Fixes:
128919950
Test: no change to behavior
Change-Id: If303386de0ce8bdc215eb42ed8ad313cbb91ca44
Brad Ebinger [Wed, 20 Mar 2019 20:10:32 +0000 (20:10 +0000)]
Merge "Make ImsException final"
Steven Moreland [Wed, 20 Mar 2019 18:46:35 +0000 (11:46 -0700)]
Merge "Remove telephony-common classes."
am:
6d77176920
Change-Id: I04c352cc56f66b06142c9a94f0b7ca7d51b26195
Pengquan Meng [Wed, 20 Mar 2019 18:42:00 +0000 (11:42 -0700)]
Merge "[API feedback] fixed API for NR"
am:
7afba9e583
Change-Id: I703b745d276171f57092668d502441d45ae6ded6
Steven Moreland [Wed, 20 Mar 2019 18:30:10 +0000 (18:30 +0000)]
Merge "Remove telephony-common classes."
Pengquan Meng [Wed, 20 Mar 2019 18:22:16 +0000 (18:22 +0000)]
Merge "[API feedback] fixed API for NR"
Pengquan Meng [Mon, 11 Mar 2019 18:12:58 +0000 (11:12 -0700)]
[API feedback] fixed API for NR
This CL included the follow change:
1. Change getPreferredNetworkTypeBitmap to
getPreferredNetworkTypeBitmask [b/
126552419]
2. Change setPreferredNetworkTypeBitmap to
setPreferredNetworkTypeBitmask [b/
126552419]
3. Add @IntRange annonation to CellIdentityNr.getNrarfcn() [b/
126552419]
4. In javadoc, explain the acronym NR to say: (New Radio 5G)
[b/
126552559]
5. Mark CellInfoNr.getCellSignalStrength and CellInfoNr.getCellIdentity
as @NonNull [b/
126699572]
6. Mark CellIdentityNr.getMncString() and CellIdentityNr.getMccString()
as @Nullable [b/
126702744]
Bug:
126552419
Bug:
126552559
Bug:
126699572
Bug:
126702744
Test: build
Merged-In: I133075a3688c3fa7550c8a2f43bc13d8b25999b2
Change-Id: I133075a3688c3fa7550c8a2f43bc13d8b25999b2
Steven Moreland [Wed, 20 Mar 2019 18:06:08 +0000 (11:06 -0700)]
Merge "pm: SharedLibraryInfo: toString closing bracket"
am:
05a8e0b44c
Change-Id: I373baed1fdd987bef7dafdbabacb86a0ef6cfbc0
Chen Xu [Wed, 20 Mar 2019 17:55:57 +0000 (10:55 -0700)]
Merge "improve mism support for phonestatelistner"
am:
ed4d220c97
Change-Id: If09726fbd0bf82fdbe2da884d97d9b78089eb1ac
Brad Ebinger [Fri, 8 Mar 2019 21:22:49 +0000 (13:22 -0800)]
Deprecate SystemApi that was accidently made public in P
ImsFeature.Capabilities was accidently made public in P
due to a reference to it in another @SystemApi method.
Marking as @Deprecated in Q and then moving back to @hide
in R.
Bug:
115639348
Test: manual
Change-Id: Iab0d0c9227798b9f4e153d1c5a0a4e16353ee87c
Treehugger Robot [Wed, 20 Mar 2019 17:51:00 +0000 (17:51 +0000)]
Merge "pm: SharedLibraryInfo: toString closing bracket"
Chen Xu [Wed, 20 Mar 2019 17:32:37 +0000 (17:32 +0000)]
Merge "improve mism support for phonestatelistner"
chen xu [Sun, 17 Mar 2019 07:50:56 +0000 (00:50 -0700)]
improve mism support for phonestatelistner
1. throw exception if reuse the same listner for different sub
2. subId should come from TM instance not phonestateListener.
3. refactor settings to apply phonestatelistner with TM instances
Bug:
117555407
Test: Manual
Change-Id: I1af07798d7982575cccc27462af179182c033409
(cherry picked from commit
0ebc9b67e96d0c4a625837ce7a32dbea4afa44ab)
Merged-in: I1af07798d7982575cccc27462af179182c033409
markchien [Tue, 19 Mar 2019 13:25:33 +0000 (21:25 +0800)]
Replace TcpSocketInfo with similar structure
Replace TcpSocketInfo with TcpKeepalivePacketDataParcelable
because their structures are very similar.
bug:
128882321
Test: -build, flash, boot
-FrameworksNetTests
Change-Id: Iafb4031a64ba4775a495c156e2c997d890c6b261
markchien [Wed, 20 Feb 2019 13:16:44 +0000 (21:16 +0800)]
Restrict scope of switch Repair Mode
Bug:
123969339
Test: -boot, flash
-atest FrameworksNetTests
Change-Id: Ie0fb685be5f7a2d06544065d67c605d87a19ff2f
Luke Huang [Sat, 16 Mar 2019 13:21:16 +0000 (21:21 +0800)]
Cleanup NetworkManagementService for Netd commnads binder migrartion
remove dead code used for netd UNIX sokcet
Bug:
65862741
Test: atest NetworkManagementServiceTest FrameworksNetTests
Change-Id: I5db61cb86325b71ac8a8fce7b15dbf569abc5935
Jack He [Wed, 20 Mar 2019 10:47:29 +0000 (03:47 -0700)]
Bluetooth: Add event_value to BluetoothClassicPairingEventReported
* Add an event_value field to log status value such as
- encryption enabled state
- simple pairing mode
- secure connection host support
- delete all flag
Bug:
128966402
Test: make
Change-Id: I512b7a1a7fba73ea30bca028566d43d353c56613
lucaslin [Wed, 20 Mar 2019 10:21:59 +0000 (18:21 +0800)]
Improve partial connectivity
Improve the design and fix some nits.
Bug:
113450764
Test: 1. Build pass
2. atest FrameworksNetTests
3. atest NetworkStackTests
4. Change captive_portal_https_url to https://invalid.com
to simulate partial connectivity.
Change-Id: Ia56645841d00d2ed8406cfeacb86a4a27fd58650
Lorenzo Colitti [Wed, 20 Mar 2019 10:18:47 +0000 (03:18 -0700)]
Merge changes from topic "framework-no-networkstack-aidl"
am:
74867d1661
Change-Id: I13ba3cb016a63353cfa62a61106d16e30eff0076
Lorenzo Colitti [Wed, 20 Mar 2019 10:11:11 +0000 (03:11 -0700)]
Move TcpKeepalivePacketData out of the framework.
am:
a3f811a547
Change-Id: I7657e6827299ad398bc16bc792150fd901226b4d
Lorenzo Colitti [Wed, 20 Mar 2019 10:03:27 +0000 (03:03 -0700)]
Stop using netd parcelables in the framework.
am:
b90ad24f99
Change-Id: Ic4ac445c582ff8b55d253d99de6750d250e9d9e5
Lorenzo Colitti [Wed, 20 Mar 2019 09:45:37 +0000 (09:45 +0000)]
Merge changes from topic "framework-no-networkstack-aidl"
* changes:
Remove the framework dependency on netd_aidl_parcelables-java.
Move TcpKeepalivePacketData out of the framework.
Stop using netd parcelables in the framework.
Remi NGUYEN VAN [Wed, 20 Mar 2019 07:35:05 +0000 (16:35 +0900)]
Define DhcpErrorEvent constants at compile time
Addresses API review comments.
Bug:
126700007
Test: m
Change-Id: I8c32a0e8bcf2d63eaf33c9ac884afd4fdbe0fdd3
Lucas Lin [Wed, 20 Mar 2019 07:07:59 +0000 (00:07 -0700)]
Merge "Fix the problem of CaptivePortalLogin app cannot show SSL error page"
am:
1a80ff943d
Change-Id: Ief7b9c8f172fa3ad5a1143d998d455797c1bf937
Lucas Lin [Wed, 20 Mar 2019 06:53:26 +0000 (06:53 +0000)]
Merge "Fix the problem of CaptivePortalLogin app cannot show SSL error page"
Jack Yu [Wed, 20 Mar 2019 06:42:34 +0000 (23:42 -0700)]
Merge "Renamed NetworkRegistrationState to NetworkRegistrationInfo"
am:
936c536bba
Change-Id: I8142e09fbee353c95a4b429e8d1bc7365aa5863e
Jack Yu [Wed, 20 Mar 2019 06:30:53 +0000 (06:30 +0000)]
Merge "Renamed NetworkRegistrationState to NetworkRegistrationInfo"
Remi NGUYEN VAN [Wed, 20 Mar 2019 05:53:43 +0000 (22:53 -0700)]
Merge "Add documentation for CaptivePortal APP_RETURN_*"
am:
31e3f2e734
Change-Id: Idc55c5c729e2a66ad845dbc8ddaf97580c7ae8cc
Remi NGUYEN VAN [Wed, 20 Mar 2019 05:40:41 +0000 (05:40 +0000)]
Merge "Add documentation for CaptivePortal APP_RETURN_*"
Sasha Smundak [Wed, 20 Mar 2019 04:25:31 +0000 (21:25 -0700)]
Merge "Convert tests/**/Android.mk files to Android.bp, part II"
am:
e1f19a6ef9
Change-Id: I036b1a4ccb3e09132a9eb51aa579db58d2e7809d
Treehugger Robot [Wed, 20 Mar 2019 01:18:56 +0000 (01:18 +0000)]
Merge "Convert tests/**/Android.mk files to Android.bp, part II"
Remi NGUYEN VAN [Wed, 20 Mar 2019 00:51:34 +0000 (17:51 -0700)]
Merge "Add Parcelable implementation for ApfCapabilities"
am:
cea27f4327
Change-Id: I218b583755259a8c0824777c3247a090bdbd348b
Remi NGUYEN VAN [Wed, 20 Mar 2019 00:34:53 +0000 (00:34 +0000)]
Merge "Add Parcelable implementation for ApfCapabilities"
Lorenzo Colitti [Mon, 18 Mar 2019 15:24:19 +0000 (00:24 +0900)]
Move TcpKeepalivePacketData out of the framework.
This class is not used in framework.jar, only in services.jar.
Move it out of the framework so framework.jar can stop depending
on the NetworkStack stable AIDL interfaces.
This should really under com.android.server as well, but that's
a cross-project change to be done in another CL.
Test: m
Bug:
128804404
Change-Id: Ib2805f7fcc516a5f6989c252365d1c95b8042703
Merged-In: Ib2805f7fcc516a5f6989c252365d1c95b8042703