OSDN Git Service
Calvin Pan [Mon, 25 Mar 2019 02:01:52 +0000 (02:01 +0000)]
Merge "Marked nullable in setter argument"
Remi NGUYEN VAN [Mon, 25 Mar 2019 01:33:59 +0000 (01:33 +0000)]
Merge "Refactor DhcpErrorEvent error codes"
Treehugger Robot [Sat, 23 Mar 2019 01:03:31 +0000 (01:03 +0000)]
Merge "Annotate Data and Voice Roaming setters with @TestApi."
Treehugger Robot [Fri, 22 Mar 2019 23:48:31 +0000 (23:48 +0000)]
Merge "Add self to OWNERS for MediaProjection."
Brad Ebinger [Fri, 22 Mar 2019 17:18:47 +0000 (17:18 +0000)]
Merge "Query isEmergencySmsMode API when checking if emergency for GPS"
Andrei-Valentin Onea [Fri, 22 Mar 2019 13:12:41 +0000 (13:12 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Andrei Onea [Fri, 22 Mar 2019 11:32:59 +0000 (11:32 +0000)]
Add @UnsupportedAppUsage annotations
For packages:
android.companion
android.filterfw
android.hardware.camera2.utils
android.inputmethodservice
android.net.nsd
android.os
android.preference
android.security.keymaster
android.service.dreams
android.telecom
android.telephony.ims.compat.feature
android.telephony
android.util
android.view.accessibility
android.media.effect
This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.
Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@
Bug:
110868826
Test: m
Merged-In: I9c2f8347952f3cc65759472b0e1a2717b285e44e
Change-Id: I14793863cf815fa3383fec6c6bf5a9365c2e17eb
Andrei-Valentin Onea [Fri, 22 Mar 2019 11:24:50 +0000 (11:24 +0000)]
Merge "Add telephony sources to hiddenapi-mappings"
Treehugger Robot [Fri, 22 Mar 2019 09:14:14 +0000 (09:14 +0000)]
Merge "Renamed the variable"
Remi NGUYEN VAN [Fri, 22 Mar 2019 07:00:50 +0000 (07:00 +0000)]
Merge "Fix targetSdkVersion for NetworkStack"
Remi NGUYEN VAN [Fri, 22 Mar 2019 06:34:18 +0000 (15:34 +0900)]
Refactor DhcpErrorEvent error codes
Addresses review comments on aosp/930843. The new format is more
concise.
Resulting constant values are unchanged as demonstrated by the absence
of change in the API file.
Test: m
Change-Id: I2e086c0411bce1d5b528de50b59dcf51e390681f
Hall Liu [Fri, 22 Mar 2019 05:44:10 +0000 (05:44 +0000)]
Merge "Add NETWORK_SCAN permission"
Hall Liu [Thu, 21 Mar 2019 23:08:03 +0000 (16:08 -0700)]
Add NETWORK_SCAN permission
Bug:
126779616
Test: compiles
Change-Id: I2dd4beffca3afdcc0a0f071404ff62747faa3877
Merged-In: I2dd4beffca3afdcc0a0f071404ff62747faa3877
Lucas Lin [Fri, 22 Mar 2019 04:17:43 +0000 (04:17 +0000)]
Merge "Enable PARTIAL_CONNECTIVITY dialog"
Luke Huang [Fri, 22 Mar 2019 03:26:21 +0000 (03:26 +0000)]
Merge "Support query cancellation for async DNS API"
Lucas Lin [Fri, 22 Mar 2019 01:16:42 +0000 (01:16 +0000)]
Merge "Modify SettingsLib for partial connectivity"
lucaslin [Thu, 21 Mar 2019 04:40:47 +0000 (12:40 +0800)]
Modify SettingsLib for partial connectivity
Add partial connectivity related settings in SettingsLib.
Bug:
113450764
Bug:
128489091
Test: 1. Build pass.
2. Fake partial connectivity case for testing.
Change-Id: I0733ecc9070e6c4281fdff40f432605d139355ec
Merged-In: I4791abe9351c62d9549ada383aa4cc8aa34ddaf2
lucaslin [Thu, 21 Mar 2019 03:59:22 +0000 (11:59 +0800)]
Enable PARTIAL_CONNECTIVITY dialog
Enable PARTIAL_CONNECTIVITY dialog to complete the function.
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: I5c9fe7a898d30d2f7f75142c85e73fefc257a147
Jack Yu [Fri, 22 Mar 2019 00:29:07 +0000 (00:29 +0000)]
Merge changes from topic "iwlan_api_review"
* changes:
IWLAN API review changes
Unhide methods required for Parcelable class
Added annotations to the API
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.
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
Treehugger Robot [Thu, 21 Mar 2019 21:46:25 +0000 (21:46 +0000)]
Merge "Deprecate SystemApi that was accidently made public in P"
Jack Yu [Mon, 18 Mar 2019 07:12:03 +0000 (00:12 -0700)]
IWLAN API review changes
Made several API changes per API council
suggestions.
Test: Manual + unit tests
Bug:
127812471
Bug:
128607082
Merged-In: I0f93c07207b10b566e9f858361e55b18dc0881a0
Change-Id: I0f93c07207b10b566e9f858361e55b18dc0881a0
(cherry picked from commit
806b64228db64e25bd04ab5da607094932561b36)
Jack Yu [Sun, 10 Mar 2019 19:45:52 +0000 (12:45 -0700)]
Unhide methods required for Parcelable class
Those methods were already public in the base class.
Test: Build
FIXES:
126702898
Merged-In: Ibce8f9bf5d1a3ebf9225fa46422dc3c78e29b1f6
Change-Id: Ibce8f9bf5d1a3ebf9225fa46422dc3c78e29b1f6
(cherry picked from commit
654bb21f703f943d24586323c9eb822fc06a0857)
Jack Yu [Tue, 5 Mar 2019 22:31:01 +0000 (14:31 -0800)]
Added annotations to the API
Added @NonNull and @Nullable to APIs.
Test: Build
Bug:
126702898
Merged-In: I697298837858829bb0851aba389159701fa0fc5e
Change-Id: I697298837858829bb0851aba389159701fa0fc5e
(cherry picked from commit
1eb3f0cdaed5a7156e9dcb11223f7f4ac82f1360)
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: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."
Andrei Onea [Wed, 13 Mar 2019 15:27:23 +0000 (15:27 +0000)]
Add telephony sources to hiddenapi-mappings
This makes it possible to annotate telephony greylisted apis in
frameworks/opt/telephony.
Test: m hiddenapi-mappings
Bug:
110868826
(cherry picked from commit
6dd843a6b2122092795fb453f1c7cd786f01688a)
Change-Id: Ie6652ad1c6ef054a11f0341d7f53f3b8aec988ae
Merged-In: I1f7d2722bd7621c9f6d1195ea212a7a0454d560d
Treehugger Robot [Thu, 21 Mar 2019 15:04:15 +0000 (15:04 +0000)]
Merge "Temporarily disable flaky test."
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 13:57:18 +0000 (13:57 +0000)]
Merge "Define DhcpErrorEvent constants at compile time"
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
calvinpan [Thu, 21 Mar 2019 08:22:05 +0000 (16:22 +0800)]
Marked nullable in setter argument
Marked nullable in setter argument
Bug:
128703423
Test: build pass
Change-Id: I2c50d59bacbcdc5190658ae7ad48920908655b97
Treehugger Robot [Thu, 21 Mar 2019 08:06:00 +0000 (08:06 +0000)]
Merge "Fix ODR issue in viewcompiler"
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"
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:34:30 +0000 (03:34 +0000)]
Merge "Improve partial connectivity"
Patrick Huang [Thu, 21 Mar 2019 02:09:20 +0000 (02:09 +0000)]
Merge "Document type of euicc privileged action extras."
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
Treehugger Robot [Thu, 21 Mar 2019 00:33:08 +0000 (00:33 +0000)]
Merge "Bluetooth: Add event_value to BluetoothClassicPairingEventReported"
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"
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: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
Jack Yu [Mon, 18 Mar 2019 18:01:42 +0000 (11:01 -0700)]
Renamed the variable
Changed nrs (stands for NetworkRegistrationState) to
nri (stands for NetworkRegistrationInfo).
Test: Build
Bug:
127657991
Merged-In: I4deb1271818019465c55b59cd4a4a8029b514697
Change-Id: I4deb1271818019465c55b59cd4a4a8029b514697
(cherry picked from commit
1746d2582ab0f8fc904f5799c2a989d5277b30e4)
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)
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: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
Brad Ebinger [Fri, 15 Mar 2019 20:50:34 +0000 (13:50 -0700)]
Query isEmergencySmsMode API when checking if emergency for GPS
When location SUPL request comes in for GPS NI handler,
also check emergency SMS mode in telephony, which
is true for a carrier defined amount of time after an
emergency SMS is sent.
Bug:
126091115
Test: manual - send fake emergency sms, check api is true.
Change-Id: I34d26d2940af5b0c412e20ce3668344da8656339
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 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 08:29:10 +0000 (17:29 +0900)]
Fix targetSdkVersion for NetworkStack
targetSdkVersion was set to 28 in aosp/916713, however this was broken
by the manifest refactor in aosp/923338: the targetSdk is not preserved
in the manifest merge.
Test: aapt dump badging shows targetSdkVersion 28
Change-Id: I7d06b141856e96ef011db32094bfc62a8cd1b350
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 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:30:53 +0000 (06:30 +0000)]
Merge "Renamed NetworkRegistrationState to NetworkRegistrationInfo"
Remi NGUYEN VAN [Wed, 20 Mar 2019 05:40:41 +0000 (05:40 +0000)]
Merge "Add documentation for CaptivePortal APP_RETURN_*"
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:34:53 +0000 (00:34 +0000)]
Merge "Add Parcelable implementation for ApfCapabilities"
Lorenzo Colitti [Tue, 19 Mar 2019 01:56:37 +0000 (10:56 +0900)]
Remove the framework dependency on netd_aidl_parcelables-java.
In its own change because it conflicts in internal master.
Test: m
Bug:
128804404
Change-Id: I74531ef11d504b232d4f377532d5e0812dbc88db
Merged-In: I74531ef11d504b232d4f377532d5e0812dbc88db
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
Lorenzo Colitti [Mon, 18 Mar 2019 14:50:34 +0000 (23:50 +0900)]
Stop using netd parcelables in the framework.
The only actual users of these classes are in services.jar, not
in frameworks.jar. The only reason the framework depends on them
is that the code that converts to and from stable parcelables is
currently in the framework. Move that code to services and cut
the dependency.
These classes aren't used in the networkstack app so they don't
need to be in shared. They also can't be in shared because the
classes are not in the SDK. So put the conversion functions
directly inside their only user (NetworkManagementService).
Also remove the jarjar rules that rename the classes for use by
the NetworkStack app.
This does not actually remove the dependency from the build file,
that will be done in a future CL.
Bug:
128804404
Test: builds, boots
Test: atest FrameworksNetTests android.net.cts.ConnectivityManagerTest HostsideVpnTests
Change-Id: I027d50ba56091f5558f45e6e08f32e5912b2a82a
Merged-In: I027d50ba56091f5558f45e6e08f32e5912b2a82a
Cody Kesting [Tue, 19 Mar 2019 23:33:40 +0000 (23:33 +0000)]
Merge "Add class comment to avoid extending ServiceState class."
Brad Ebinger [Tue, 19 Mar 2019 21:48:37 +0000 (14:48 -0700)]
Make ImsException final
Bug:
128902253
Test: atest FrameworksTelephonyTests
Change-Id: I88058f8382978163718de8194249fad87ae52d10
Cody Kesting [Fri, 15 Mar 2019 18:20:01 +0000 (11:20 -0700)]
Annotate Data and Voice Roaming setters with @TestApi.
CTS testing for ServiceState's getRoaming() requires using
setDataRoamingType() and setVoiceRoamingType() for preparing state.
These are currently annotated as @hide and @UnsupportedAppUsage, with a
maxTargetSdk of P.
Bug:
74207290
Test: atest CtsTelephonyTestCases:ServiceStateTest
Change-Id: I08efeeae81494c0431ce34c5d68a73d4824c8d1d
Andreas Gampe [Tue, 19 Mar 2019 21:37:38 +0000 (21:37 +0000)]
Merge "Zygote: Load system server code early"
Treehugger Robot [Tue, 19 Mar 2019 21:19:16 +0000 (21:19 +0000)]
Merge "Add uid information in PackageListObserver"
Treehugger Robot [Tue, 19 Mar 2019 18:21:35 +0000 (18:21 +0000)]
Merge "Notify caller when unlockUser() bails out"
Andreas Gampe [Fri, 15 Mar 2019 18:56:48 +0000 (11:56 -0700)]
Zygote: Load system server code early
In an effort to allow loading integrity-checked artifacts from
the dalvik-cache, attempt to create and cache the system server's
classloader early, while still being in the system_server_startup
selinux domain.
The advantage of this approach is that allowances for loading
from the cache are restricted to startup.
Bug:
128688902
Test: m
Test: Device boots, picks up /system artifacts
Test: Device boots, picks up integrity-checked /data artifacts
Merged-In: If4a75fa106db09f1bd666d6d8df7ac3ac3e35a8c
Change-Id: If4a75fa106db09f1bd666d6d8df7ac3ac3e35a8c
Howard Chen [Tue, 5 Mar 2019 06:23:47 +0000 (14:23 +0800)]
Support starting gsid lazily
The aosp/914714 made the gsid to start when needed.
The DynamicAndroidService must support this behavior as well.
Bug:
126622385
Test: adb shell am start-activity \
-n com.android.dynandroid/com.android.dynandroid.VerificationActivity \
-a android.content.action.START_INSTALL \
--es KEY_SYSTEM_URL file:///storage/emulated/0/Download/system.raw.gz \
--el KEY_SYSTEM_SIZE $(du -b system.raw) \
--el KEY_USERDATA_SIZE
8589934592
Change-Id: Ifb9d642d183ed3e7181ed643f9415850178ef58d
Treehugger Robot [Tue, 19 Mar 2019 16:18:28 +0000 (16:18 +0000)]
Merge "Add unit tests related to data accounting for VPNs with one underlying network."