Commit Graph

384154 Commits

Author SHA1 Message Date
Luke Huang
c19f41b2b2 Merge "Support query cancellation for async DNS API"
am: aed6ea52de

Change-Id: I400d98e13cf36ca16c3743eddee96bfae4b47b5c
2019-03-21 20:50:18 -07:00
Luke Huang
aed6ea52de Merge "Support query cancellation for async DNS API" 2019-03-22 03:26:21 +00:00
Lucas Lin
1eb23ba267 Merge "Modify SettingsLib for partial connectivity"
am: 64bb980f45

Change-Id: I8a66d66ca058613a3a173593c64c789c55269c88
2019-03-21 18:30:59 -07:00
Lucas Lin
64bb980f45 Merge "Modify SettingsLib for partial connectivity" 2019-03-22 01:16:42 +00:00
lucaslin
1d30e133ce 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
2019-03-22 09:12:09 +08:00
Jack Yu
8a6dbb8446 Merge changes from topic "iwlan_api_review"
am: ac3406f9c6

Change-Id: I39775146064de0041c963a460f20a65e94fa6e78
2019-03-21 17:50:56 -07:00
Brad Ebinger
7d73c0b4d6 Merge "Fix build due to no explanatory comment."
am: 0b6c77167e

Change-Id: Icc0a8be233ab0a5f5f86541b452ae82e6415fd4c
2019-03-21 17:44:07 -07:00
Lorenzo Colitti
9b86ed3c65 Merge changes I2e8c2ad9,Ic4f4c7d2
am: 0c089bcc82

Change-Id: I09d0c721fc8d9755b9310bbe252aa45ab9f147f2
2019-03-21 17:39:56 -07:00
Jack Yu
ac3406f9c6 Merge changes from topic "iwlan_api_review"
* changes:
  IWLAN API review changes
  Unhide methods required for Parcelable class
  Added annotations to the API
2019-03-22 00:29:07 +00:00
Brad Ebinger
0b6c77167e Merge "Fix build due to no explanatory comment." 2019-03-22 00:25:11 +00:00
Lorenzo Colitti
0c089bcc82 Merge changes I2e8c2ad9,Ic4f4c7d2
* changes:
  Move the networkstack AIDL interfaces to services/net.
  Remove the framework dependency on networkstack-aidl-framework.
2019-03-22 00:23:22 +00:00
Patrick Huang
e41be2c876 Merge "Add "from" extra for ACTION_TOGGLE_SUBSCRIPTION_PRIVILEGED"
am: 9a1888ce62

Change-Id: I342884174fbaaa13b0973038f6cb70258ba436d7
2019-03-21 16:51:05 -07:00
Holly Jiuyu Sun
653b7f6059 Merge "Fix the assumption in GetEuiccProfileInfoListResult."
am: ee7a7f63a9

Change-Id: I13835ff69637a5e8acb09191a2c0f9067b0688d8
2019-03-21 16:43:11 -07:00
Nathan Harold
2c3dba9194 Merge "Expose CellInfoTdscdma"
am: 0b88e07ea5

Change-Id: I6ec42e526ba4a26f26b263c9ab7d83a10a476e97
2019-03-21 16:35:46 -07:00
Treehugger Robot
9a1888ce62 Merge "Add "from" extra for ACTION_TOGGLE_SUBSCRIPTION_PRIVILEGED" 2019-03-21 23:35:39 +00:00
Treehugger Robot
ee7a7f63a9 Merge "Fix the assumption in GetEuiccProfileInfoListResult." 2019-03-21 23:35:31 +00:00
Nathan Harold
0b88e07ea5 Merge "Expose CellInfoTdscdma" 2019-03-21 23:19:43 +00:00
Brad Ebinger
ef44a92a73 Fix build due to no explanatory comment.
Test: manual build
Change-Id: Ibfb3a114c74d673eb94dd2fa1fc9b9918283e9db
2019-03-21 15:31:01 -07:00
Holly Jiuyu Sun
60ca2d34b0 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
2019-03-21 15:08:46 -07:00
Brad Ebinger
1cb491e423 Merge "Deprecate SystemApi that was accidently made public in P"
am: 18870b2e4e

Change-Id: I235d5466ac67e60d4cf59c28131c30421fbfd18c
2019-03-21 14:58:24 -07:00
Treehugger Robot
18870b2e4e Merge "Deprecate SystemApi that was accidently made public in P" 2019-03-21 21:46:25 +00:00
Jack Yu
c876b65663 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 806b64228d)
2019-03-21 14:12:24 -07:00
Jack Yu
aff62b8a32 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 654bb21f70)
2019-03-21 13:40:37 -07:00
Jack Yu
22241e1788 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 1eb3f0cdae)
2019-03-21 13:39:21 -07:00
Michele Berionne
be4d9657a7 Merge "Modified MultiSim APIs"
am: c5461c4490

Change-Id: I12da49b887202f340be7f1a290bdc8c99863eac0
2019-03-21 12:07:24 -07:00
Michele Berionne
c5461c4490 Merge "Modified MultiSim APIs" 2019-03-21 18:53:11 +00:00
Patrick Huang
d1385242ad 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
2019-03-21 11:22:39 -07:00
Neil Fuller
20fd6bdc01 Merge "Require the ANDROID_TZDATA_ROOT env var"
am: f6c4aa1f67

Change-Id: Ic307cf7c3e648f37170834c1b265761de4d77b6b
2019-03-21 10:59:49 -07:00
Jordan Liu
ea992811ff Merge "Update documentation"
am: ae25b62203

Change-Id: Idbe416dbd182eea082c67de330f38f3696f81b11
2019-03-21 10:55:23 -07:00
Paul Hu
9e3f29037b Merge "Fix Automated API Review issues."
am: 43c1ade661

Change-Id: I9c007c129269a80d9aede31c8980dbd42e9f1f84
2019-03-21 10:46:03 -07:00
Neil Fuller
f6c4aa1f67 Merge "Require the ANDROID_TZDATA_ROOT env var" 2019-03-21 17:43:45 +00:00
Jordan Liu
ae25b62203 Merge "Update documentation" 2019-03-21 17:36:14 +00:00
Paul Hu
43c1ade661 Merge "Fix Automated API Review issues." 2019-03-21 17:19:26 +00:00
lucaslin
6962eea7c7 Merge "Temporarily disable flaky test."
am: 775d11c988

Change-Id: I3f2f81a6884ba1ffc212c4da393846a597af831b
2019-03-21 08:19:47 -07:00
Treehugger Robot
775d11c988 Merge "Temporarily disable flaky test." 2019-03-21 15:04:15 +00:00
Paul Hu
69aa833953 Merge "Fix Automated API Review issues."
am: 814bb8f627

Change-Id: I9cbe7dc166ec066b8785553f31dc32ea0572be8e
2019-03-21 07:24:16 -07:00
Lorenzo Colitti
306e8cd9e7 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
2019-03-21 23:23:57 +09:00
Lorenzo Colitti
ede75b5f93 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
2019-03-21 23:14:12 +09:00
Paul Hu
814bb8f627 Merge "Fix Automated API Review issues." 2019-03-21 14:11:36 +00:00
Remi NGUYEN VAN
a0b2076f75 Merge "Define DhcpErrorEvent constants at compile time"
am: 5803191975

Change-Id: I6ccc8d92c5742422fc29da1fe15d6108d036b72f
2019-03-21 07:09:14 -07:00
Remi NGUYEN VAN
5803191975 Merge "Define DhcpErrorEvent constants at compile time" 2019-03-21 13:57:18 +00:00
Mark Chien
43411c851d Merge "Replace TcpSocketInfo with similar structure"
am: a34aa2acab

Change-Id: I6e3f89a910fc3ab7524da1c5c5b525a72191a4ed
2019-03-21 05:14:45 -07:00
Mark Chien
a34aa2acab Merge "Replace TcpSocketInfo with similar structure" 2019-03-21 12:02:54 +00:00
lucaslin
5ecbb809de Temporarily disable flaky test.
Test: None
Bug: 128426024
Change-Id: I6fa12e50decbafe9d934030865c5a8f20d42b86f
2019-03-21 19:14:32 +08:00
Colin Cross
d1e12a6112 Merge "Fix ODR issue in viewcompiler"
am: b9879d00c4

Change-Id: I2fda6bdf7ebc082a732d75d55694d47f5a755fdc
2019-03-21 01:23:40 -07:00
Treehugger Robot
b9879d00c4 Merge "Fix ODR issue in viewcompiler" 2019-03-21 08:06:00 +00:00
Mark Chien
71b38a20ef Merge "Restrict scope of switch Repair Mode"
am: 21caf8d65e

Change-Id: Ie655ad82d0441aa6ad6fc45a6e63dc2a53338148
2019-03-21 00:18:11 -07:00
paulhu
79b380cfe7 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
2019-03-21 15:16:58 +08:00
Mark Chien
21caf8d65e Merge "Restrict scope of switch Repair Mode" 2019-03-21 07:02:14 +00:00
Luke Huang
e374524144 Merge "Cleanup NetworkManagementService for Netd commnads binder migrartion"
am: 3af01e2f46

Change-Id: I86ca4cab29099b26f797ef6fce94dbb6f5183b90
2019-03-20 23:18:25 -07:00