OSDN Git Service

android-x86/frameworks-base.git
5 years ago[automerger skipped] Revert "Revert "Update VPN capabilities when its underlying...
Varun Anand [Fri, 22 Mar 2019 18:45:16 +0000 (11:45 -0700)]
[automerger skipped] Revert "Revert "Update VPN capabilities when its underlying network set is null.""
am: 9f98789d3f -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 4fa80e8a2f is in history

Change-Id: I98242257e569eeac747c0328dfa6381e49e7c0b0

5 years ago[automerger skipped] Merge "Remove ConnectivityManager and its usages from NetworkSta...
Varun Anand [Fri, 22 Mar 2019 18:39:41 +0000 (11:39 -0700)]
[automerger skipped] Merge "Remove ConnectivityManager and its usages from NetworkStatsService." into pi-dev
am: a24113f030 -s ours
am skip reason: SHA1 a24113f030 skipped by user vaanand

Change-Id: Ieee5f28f6d10b0d2b8a7b3eb0272297f148ef03f

5 years agoMerge "Query isEmergencySmsMode API when checking if emergency for GPS" am: dedc27142d
Brad Ebinger [Fri, 22 Mar 2019 17:48:18 +0000 (10:48 -0700)]
Merge "Query isEmergencySmsMode API when checking if emergency for GPS" am: dedc27142d
am: 3b176bc1de

Change-Id: I26112e78477a755fe0fd373a8fdbdceb864fcea0

5 years agoMerge "Query isEmergencySmsMode API when checking if emergency for GPS"
Brad Ebinger [Fri, 22 Mar 2019 17:36:07 +0000 (10:36 -0700)]
Merge "Query isEmergencySmsMode API when checking if emergency for GPS"
am: dedc27142d

Change-Id: Ieccb97fb300455e9338c022c46466bed355be79a

5 years agoMerge "Query isEmergencySmsMode API when checking if emergency for GPS"
Brad Ebinger [Fri, 22 Mar 2019 17:18:47 +0000 (17:18 +0000)]
Merge "Query isEmergencySmsMode API when checking if emergency for GPS"

5 years agoMerge "Add @UnsupportedAppUsage annotations" am: 88e2a9aaee
Andrei-Valentin Onea [Fri, 22 Mar 2019 13:35:02 +0000 (06:35 -0700)]
Merge "Add @UnsupportedAppUsage annotations" am: 88e2a9aaee
am: 02f43694e4

Change-Id: Id5e95d173ab7c2595ae148f73d3d7381b0ea8226

5 years agoMerge "Add @UnsupportedAppUsage annotations"
Andrei-Valentin Onea [Fri, 22 Mar 2019 13:25:44 +0000 (06:25 -0700)]
Merge "Add @UnsupportedAppUsage annotations"
am: 88e2a9aaee

Change-Id: I63ae22279aa46522b652cdc9329567a04a7ef136

5 years agoMerge "Add @UnsupportedAppUsage annotations"
Andrei-Valentin Onea [Fri, 22 Mar 2019 13:12:41 +0000 (13:12 +0000)]
Merge "Add @UnsupportedAppUsage annotations"

5 years agoMerge "Add telephony sources to hiddenapi-mappings" am: 824c531396
Andrei-Valentin Onea [Fri, 22 Mar 2019 11:46:02 +0000 (04:46 -0700)]
Merge "Add telephony sources to hiddenapi-mappings" am: 824c531396
am: f3cf84c690

Change-Id: I469462b12f0813e6ed7bd179ff58d4c09fbd50a5

5 years agoAdd @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

5 years agoMerge "Add telephony sources to hiddenapi-mappings"
Andrei-Valentin Onea [Fri, 22 Mar 2019 11:36:49 +0000 (04:36 -0700)]
Merge "Add telephony sources to hiddenapi-mappings"
am: 824c531396

Change-Id: Ic5a0a2600dcdd030139f0c50e3b445053ba2c2c5

5 years agoMerge "Add telephony sources to hiddenapi-mappings"
Andrei-Valentin Onea [Fri, 22 Mar 2019 11:24:50 +0000 (11:24 +0000)]
Merge "Add telephony sources to hiddenapi-mappings"

5 years agoMerge "Renamed the variable" am: afa94f4664
Jack Yu [Fri, 22 Mar 2019 09:41:17 +0000 (02:41 -0700)]
Merge "Renamed the variable" am: afa94f4664
am: f2a8ea192c

Change-Id: I915e00c7392e31180099abf35982cc1a5a3ffc17

5 years agoMerge "Renamed the variable"
Jack Yu [Fri, 22 Mar 2019 09:32:18 +0000 (02:32 -0700)]
Merge "Renamed the variable"
am: afa94f4664

Change-Id: I688d8126bb0207f8efcccba3e9857144e3f6067b

5 years agoMerge "Renamed the variable"
Treehugger Robot [Fri, 22 Mar 2019 09:14:14 +0000 (09:14 +0000)]
Merge "Renamed the variable"

5 years agoMerge "Fix targetSdkVersion for NetworkStack" am: 42b97de9d3
Remi NGUYEN VAN [Fri, 22 Mar 2019 07:21:21 +0000 (00:21 -0700)]
Merge "Fix targetSdkVersion for NetworkStack" am: 42b97de9d3
am: ba2f3d2fdf

Change-Id: I7be8a9f1020d56cdf9ac87a47a25cab77d66958e

5 years agoMerge "Fix targetSdkVersion for NetworkStack"
Remi NGUYEN VAN [Fri, 22 Mar 2019 07:12:43 +0000 (00:12 -0700)]
Merge "Fix targetSdkVersion for NetworkStack"
am: 42b97de9d3

Change-Id: Id9786b9d607950990427316379c3bb46bf188703

5 years agoMerge "Fix targetSdkVersion for NetworkStack"
Remi NGUYEN VAN [Fri, 22 Mar 2019 07:00:50 +0000 (07:00 +0000)]
Merge "Fix targetSdkVersion for NetworkStack"

5 years agoMerge "Add NETWORK_SCAN permission" am: 419956210a
Hall Liu [Fri, 22 Mar 2019 06:17:16 +0000 (23:17 -0700)]
Merge "Add NETWORK_SCAN permission" am: 419956210a
am: 3f7de4bc99

Change-Id: Ic69dd3d51ac2038ff5291ec6ce3bd176c66b9d31

5 years agoMerge "Add NETWORK_SCAN permission"
Hall Liu [Fri, 22 Mar 2019 06:02:09 +0000 (23:02 -0700)]
Merge "Add NETWORK_SCAN permission"
am: 419956210a

Change-Id: Ia9fe0ff68145e1a6bbb5bd903012e1ecb57a3d0b

5 years agoMerge "Add NETWORK_SCAN permission"
Hall Liu [Fri, 22 Mar 2019 05:44:10 +0000 (05:44 +0000)]
Merge "Add NETWORK_SCAN permission"

5 years agoAdd 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

5 years agoMerge "Enable PARTIAL_CONNECTIVITY dialog" am: 507d69d5d9
Lucas Lin [Fri, 22 Mar 2019 04:40:39 +0000 (21:40 -0700)]
Merge "Enable PARTIAL_CONNECTIVITY dialog" am: 507d69d5d9
am: e2f6ad6b48

Change-Id: I2e1947cdf6e084aefd4d2ccd7b345df79c62e383

5 years agoMerge "Enable PARTIAL_CONNECTIVITY dialog"
Lucas Lin [Fri, 22 Mar 2019 04:30:48 +0000 (21:30 -0700)]
Merge "Enable PARTIAL_CONNECTIVITY dialog"
am: 507d69d5d9

Change-Id: I88ca44ef0c0a7cf48538421022d0fed10d15fc26

5 years agoMerge "Enable PARTIAL_CONNECTIVITY dialog"
Lucas Lin [Fri, 22 Mar 2019 04:17:43 +0000 (04:17 +0000)]
Merge "Enable PARTIAL_CONNECTIVITY dialog"

5 years agoMerge "Support query cancellation for async DNS API" am: aed6ea52de
Luke Huang [Fri, 22 Mar 2019 04:13:29 +0000 (21:13 -0700)]
Merge "Support query cancellation for async DNS API" am: aed6ea52de
am: c19f41b2b2

Change-Id: I890bbb94bf1b8e2242efeb5c868e289a8ae4a95d

5 years agoMerge "Support query cancellation for async DNS API"
Luke Huang [Fri, 22 Mar 2019 03:50:18 +0000 (20:50 -0700)]
Merge "Support query cancellation for async DNS API"
am: aed6ea52de

Change-Id: I400d98e13cf36ca16c3743eddee96bfae4b47b5c

5 years agoMerge "Support query cancellation for async DNS API"
Luke Huang [Fri, 22 Mar 2019 03:26:21 +0000 (03:26 +0000)]
Merge "Support query cancellation for async DNS API"

5 years agoMerge "Modify SettingsLib for partial connectivity" am: 64bb980f45
Lucas Lin [Fri, 22 Mar 2019 01:42:46 +0000 (18:42 -0700)]
Merge "Modify SettingsLib for partial connectivity" am: 64bb980f45
am: 1eb23ba267

Change-Id: I8b6c1ef312c0b79f41ebbfe17eaccfa535ac0597

5 years agoMerge "Modify SettingsLib for partial connectivity"
Lucas Lin [Fri, 22 Mar 2019 01:30:59 +0000 (18:30 -0700)]
Merge "Modify SettingsLib for partial connectivity"
am: 64bb980f45

Change-Id: I8a66d66ca058613a3a173593c64c789c55269c88

5 years agoMerge "Modify SettingsLib for partial connectivity"
Lucas Lin [Fri, 22 Mar 2019 01:16:42 +0000 (01:16 +0000)]
Merge "Modify SettingsLib for partial connectivity"

5 years agoModify 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

5 years agoEnable PARTIAL_CONNECTIVITY dialog
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

5 years agoMerge changes from topic "iwlan_api_review" am: ac3406f9c6
Jack Yu [Fri, 22 Mar 2019 01:05:52 +0000 (18:05 -0700)]
Merge changes from topic "iwlan_api_review" am: ac3406f9c6
am: 8a6dbb8446

Change-Id: Ie30207bae71e1c45a9d2ae76132c3012f9f5dd37

5 years agoMerge "Fix build due to no explanatory comment." am: 0b6c77167e
Brad Ebinger [Fri, 22 Mar 2019 00:55:02 +0000 (17:55 -0700)]
Merge "Fix build due to no explanatory comment." am: 0b6c77167e
am: 7d73c0b4d6

Change-Id: I544a7b4a5c24186d675377ee64945d32ffe0a628

5 years agoMerge changes from topic "iwlan_api_review"
Jack Yu [Fri, 22 Mar 2019 00:50:56 +0000 (17:50 -0700)]
Merge changes from topic "iwlan_api_review"
am: ac3406f9c6

Change-Id: I39775146064de0041c963a460f20a65e94fa6e78

5 years agoMerge changes I2e8c2ad9,Ic4f4c7d2 am: 0c089bcc82
Lorenzo Colitti [Fri, 22 Mar 2019 00:47:26 +0000 (17:47 -0700)]
Merge changes I2e8c2ad9,Ic4f4c7d2 am: 0c089bcc82
am: 9b86ed3c65

Change-Id: I068d2eb07d57779dda4d7b9e5bcd94e0ee8dc686

5 years agoMerge "Fix build due to no explanatory comment."
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

5 years agoMerge changes I2e8c2ad9,Ic4f4c7d2
Lorenzo Colitti [Fri, 22 Mar 2019 00:39:56 +0000 (17:39 -0700)]
Merge changes I2e8c2ad9,Ic4f4c7d2
am: 0c089bcc82

Change-Id: I09d0c721fc8d9755b9310bbe252aa45ab9f147f2

5 years agoMerge changes from topic "iwlan_api_review"
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

5 years agoMerge "Fix build due to no explanatory comment."
Brad Ebinger [Fri, 22 Mar 2019 00:25:11 +0000 (00:25 +0000)]
Merge "Fix build due to no explanatory comment."

5 years agoMerge changes I2e8c2ad9,Ic4f4c7d2
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.

5 years agoMerge "Add "from" extra for ACTION_TOGGLE_SUBSCRIPTION_PRIVILEGED" am: 9a1888ce62
Patrick Huang [Fri, 22 Mar 2019 00:11:04 +0000 (17:11 -0700)]
Merge "Add "from" extra for ACTION_TOGGLE_SUBSCRIPTION_PRIVILEGED" am: 9a1888ce62
am: e41be2c876

Change-Id: I6f343eafd8379253d274c98a9097df50976b9522

5 years agoMerge "Fix the assumption in GetEuiccProfileInfoListResult." am: ee7a7f63a9
Holly Jiuyu Sun [Thu, 21 Mar 2019 23:52:19 +0000 (16:52 -0700)]
Merge "Fix the assumption in GetEuiccProfileInfoListResult." am: ee7a7f63a9
am: 653b7f6059

Change-Id: I3affc2649067842c6b7a082ac11e28e34da836d9

5 years agoMerge "Add "from" extra for ACTION_TOGGLE_SUBSCRIPTION_PRIVILEGED"
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

5 years agoMerge "Expose CellInfoTdscdma" am: 0b88e07ea5
Nathan Harold [Thu, 21 Mar 2019 23:44:22 +0000 (16:44 -0700)]
Merge "Expose CellInfoTdscdma" am: 0b88e07ea5
am: 2c3dba9194

Change-Id: Iafbadf538af679b87ed4be9831b21562ff701fab

5 years agoMerge "Fix the assumption in GetEuiccProfileInfoListResult."
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

5 years agoMerge "Expose CellInfoTdscdma"
Nathan Harold [Thu, 21 Mar 2019 23:35:46 +0000 (16:35 -0700)]
Merge "Expose CellInfoTdscdma"
am: 0b88e07ea5

Change-Id: I6ec42e526ba4a26f26b263c9ab7d83a10a476e97

5 years agoMerge "Add "from" extra for ACTION_TOGGLE_SUBSCRIPTION_PRIVILEGED"
Treehugger Robot [Thu, 21 Mar 2019 23:35:39 +0000 (23:35 +0000)]
Merge "Add "from" extra for ACTION_TOGGLE_SUBSCRIPTION_PRIVILEGED"

5 years agoMerge "Fix the assumption in GetEuiccProfileInfoListResult."
Treehugger Robot [Thu, 21 Mar 2019 23:35:31 +0000 (23:35 +0000)]
Merge "Fix the assumption in GetEuiccProfileInfoListResult."

5 years agoMerge "Expose CellInfoTdscdma"
Nathan Harold [Thu, 21 Mar 2019 23:19:43 +0000 (23:19 +0000)]
Merge "Expose CellInfoTdscdma"

5 years agoFix build due to no explanatory comment.
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

5 years agoFix the assumption in GetEuiccProfileInfoListResult.
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

5 years agoMerge "Deprecate SystemApi that was accidently made public in P" am: 18870b2e4e
Brad Ebinger [Thu, 21 Mar 2019 22:07:39 +0000 (15:07 -0700)]
Merge "Deprecate SystemApi that was accidently made public in P" am: 18870b2e4e
am: 1cb491e423

Change-Id: Ieafcc2c15eb0b7a2968faf979fe93e31088e86b5

5 years agoMerge "Deprecate SystemApi that was accidently made public in P"
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

5 years agoMerge "Deprecate SystemApi that was accidently made public in P"
Treehugger Robot [Thu, 21 Mar 2019 21:46:25 +0000 (21:46 +0000)]
Merge "Deprecate SystemApi that was accidently made public in P"

5 years agoIWLAN API review changes
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)

5 years agoUnhide methods required for Parcelable class
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)

5 years agoAdded annotations to the API
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)

5 years agoMerge "Modified MultiSim APIs" am: c5461c4490
Michele Berionne [Thu, 21 Mar 2019 19:19:47 +0000 (12:19 -0700)]
Merge "Modified MultiSim APIs" am: c5461c4490
am: be4d9657a7

Change-Id: I9aa4e0231b7f546f8e26ba9a77c20f4e4a89dc86

5 years agoMerge "Modified MultiSim APIs"
Michele Berionne [Thu, 21 Mar 2019 19:07:24 +0000 (12:07 -0700)]
Merge "Modified MultiSim APIs"
am: c5461c4490

Change-Id: I12da49b887202f340be7f1a290bdc8c99863eac0

5 years agoMerge "Modified MultiSim APIs"
Michele Berionne [Thu, 21 Mar 2019 18:53:11 +0000 (18:53 +0000)]
Merge "Modified MultiSim APIs"

5 years agoMerge "Require the ANDROID_TZDATA_ROOT env var" am: f6c4aa1f67
Neil Fuller [Thu, 21 Mar 2019 18:23:43 +0000 (11:23 -0700)]
Merge "Require the ANDROID_TZDATA_ROOT env var" am: f6c4aa1f67
am: 20fd6bdc01

Change-Id: Id3356648249cb0ca9bb520e56e401c8e63327e58

5 years agoAdd "from" extra for ACTION_TOGGLE_SUBSCRIPTION_PRIVILEGED
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

5 years agoMerge "Update documentation" am: ae25b62203
Jordan Liu [Thu, 21 Mar 2019 18:14:33 +0000 (11:14 -0700)]
Merge "Update documentation" am: ae25b62203
am: ea992811ff

Change-Id: Ic4d2927b28a1684f2bd926be8c27b2215104d5c6

5 years agoMerge "Fix Automated API Review issues." am: 43c1ade661
Paul Hu [Thu, 21 Mar 2019 18:01:28 +0000 (11:01 -0700)]
Merge "Fix Automated API Review issues." am: 43c1ade661
am: 9e3f29037b

Change-Id: I881ceb928c0cf8663b0de5f2451846bfe39f2090

5 years agoMerge "Require the ANDROID_TZDATA_ROOT env var"
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

5 years agoMerge "Update documentation"
Jordan Liu [Thu, 21 Mar 2019 17:55:23 +0000 (10:55 -0700)]
Merge "Update documentation"
am: ae25b62203

Change-Id: Idbe416dbd182eea082c67de330f38f3696f81b11

5 years agoMerge "Fix Automated API Review issues."
Paul Hu [Thu, 21 Mar 2019 17:46:03 +0000 (10:46 -0700)]
Merge "Fix Automated API Review issues."
am: 43c1ade661

Change-Id: I9c007c129269a80d9aede31c8980dbd42e9f1f84

5 years agoMerge "Require the ANDROID_TZDATA_ROOT env var"
Neil Fuller [Thu, 21 Mar 2019 17:43:45 +0000 (17:43 +0000)]
Merge "Require the ANDROID_TZDATA_ROOT env var"

5 years agoMerge "Update documentation"
Jordan Liu [Thu, 21 Mar 2019 17:36:14 +0000 (17:36 +0000)]
Merge "Update documentation"

5 years agoMerge "Fix Automated API Review issues."
Paul Hu [Thu, 21 Mar 2019 17:19:26 +0000 (17:19 +0000)]
Merge "Fix Automated API Review issues."

5 years agoAdd telephony sources to hiddenapi-mappings
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

5 years agoMerge "Temporarily disable flaky test." am: 775d11c988
lucaslin [Thu, 21 Mar 2019 15:29:50 +0000 (08:29 -0700)]
Merge "Temporarily disable flaky test." am: 775d11c988
am: 6962eea7c7

Change-Id: Iec5d70ab6e5afff9ce2a633aa5a1316fa94ef9ad

5 years agoMerge "Temporarily disable flaky test."
lucaslin [Thu, 21 Mar 2019 15:19:47 +0000 (08:19 -0700)]
Merge "Temporarily disable flaky test."
am: 775d11c988

Change-Id: I3f2f81a6884ba1ffc212c4da393846a597af831b

5 years agoMerge "Temporarily disable flaky test."
Treehugger Robot [Thu, 21 Mar 2019 15:04:15 +0000 (15:04 +0000)]
Merge "Temporarily disable flaky test."

5 years agoMerge "Fix Automated API Review issues." am: 814bb8f627
Paul Hu [Thu, 21 Mar 2019 14:33:48 +0000 (07:33 -0700)]
Merge "Fix Automated API Review issues." am: 814bb8f627
am: 69aa833953

Change-Id: I29f4cb581574f2542d461de6a0939e58bfc88059

5 years agoMerge "Fix Automated API Review issues."
Paul Hu [Thu, 21 Mar 2019 14:24:16 +0000 (07:24 -0700)]
Merge "Fix Automated API Review issues."
am: 814bb8f627

Change-Id: I9cbe7dc166ec066b8785553f31dc32ea0572be8e

5 years agoMove the networkstack AIDL interfaces to services/net.
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

5 years agoMerge "Define DhcpErrorEvent constants at compile time" am: 5803191975
Remi NGUYEN VAN [Thu, 21 Mar 2019 14:19:33 +0000 (07:19 -0700)]
Merge "Define DhcpErrorEvent constants at compile time" am: 5803191975
am: a0b2076f75

Change-Id: Iada7c4e80233ea451b88bba2cf81bdfad225fe09

5 years agoRemove the framework dependency on networkstack-aidl-framework.
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

5 years agoMerge "Fix Automated API Review issues."
Paul Hu [Thu, 21 Mar 2019 14:11:36 +0000 (14:11 +0000)]
Merge "Fix Automated API Review issues."

5 years agoMerge "Define DhcpErrorEvent constants at compile time"
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

5 years agoMerge "Define DhcpErrorEvent constants at compile time"
Remi NGUYEN VAN [Thu, 21 Mar 2019 13:57:18 +0000 (13:57 +0000)]
Merge "Define DhcpErrorEvent constants at compile time"

5 years agoMerge "Replace TcpSocketInfo with similar structure" am: a34aa2acab
Mark Chien [Thu, 21 Mar 2019 12:24:03 +0000 (05:24 -0700)]
Merge "Replace TcpSocketInfo with similar structure" am: a34aa2acab
am: 43411c851d

Change-Id: I8ce393e01d48d87deefc0ac9e8c041224b6d4bae

5 years agoMerge "Replace TcpSocketInfo with similar structure"
Mark Chien [Thu, 21 Mar 2019 12:14:45 +0000 (05:14 -0700)]
Merge "Replace TcpSocketInfo with similar structure"
am: a34aa2acab

Change-Id: I6e3f89a910fc3ab7524da1c5c5b525a72191a4ed

5 years agoMerge "Replace TcpSocketInfo with similar structure"
Mark Chien [Thu, 21 Mar 2019 12:02:54 +0000 (12:02 +0000)]
Merge "Replace TcpSocketInfo with similar structure"

5 years agoTemporarily disable flaky test.
lucaslin [Thu, 21 Mar 2019 11:14:32 +0000 (19:14 +0800)]
Temporarily disable flaky test.

Test: None
Bug: 128426024
Change-Id: I6fa12e50decbafe9d934030865c5a8f20d42b86f

5 years agoMerge "Fix ODR issue in viewcompiler" am: b9879d00c4
Colin Cross [Thu, 21 Mar 2019 08:33:12 +0000 (01:33 -0700)]
Merge "Fix ODR issue in viewcompiler" am: b9879d00c4
am: d1e12a6112

Change-Id: If323e9e1a097055d359e1cba146f31449f640253

5 years agoMerge "Fix ODR issue in viewcompiler"
Colin Cross [Thu, 21 Mar 2019 08:23:40 +0000 (01:23 -0700)]
Merge "Fix ODR issue in viewcompiler"
am: b9879d00c4

Change-Id: I2fda6bdf7ebc082a732d75d55694d47f5a755fdc

5 years agoMerge "Fix ODR issue in viewcompiler"
Treehugger Robot [Thu, 21 Mar 2019 08:06:00 +0000 (08:06 +0000)]
Merge "Fix ODR issue in viewcompiler"

5 years agoMerge "Restrict scope of switch Repair Mode" am: 21caf8d65e
Mark Chien [Thu, 21 Mar 2019 07:29:01 +0000 (00:29 -0700)]
Merge "Restrict scope of switch Repair Mode" am: 21caf8d65e
am: 71b38a20ef

Change-Id: If23aeef3979ba1ea523a5f86b366f433c616c94f

5 years agoMerge "Restrict scope of switch Repair Mode"
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

5 years agoFix Automated API Review issues.
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

5 years agoMerge "Restrict scope of switch Repair Mode"
Mark Chien [Thu, 21 Mar 2019 07:02:14 +0000 (07:02 +0000)]
Merge "Restrict scope of switch Repair Mode"

5 years agoMerge "Cleanup NetworkManagementService for Netd commnads binder migrartion" am:...
Luke Huang [Thu, 21 Mar 2019 06:28:53 +0000 (23:28 -0700)]
Merge "Cleanup NetworkManagementService for Netd commnads binder migrartion" am: 3af01e2f46
am: e374524144

Change-Id: Idb5909a8a537ae155a985670cfaf4e993ef3d95d

5 years agoMerge "Cleanup NetworkManagementService for Netd commnads binder migrartion"
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

5 years agoModified MultiSim APIs
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

5 years agoMerge "Cleanup NetworkManagementService for Netd commnads binder migrartion"
Luke Huang [Thu, 21 Mar 2019 06:01:25 +0000 (06:01 +0000)]
Merge "Cleanup NetworkManagementService for Netd commnads binder migrartion"

5 years agoFix Automated API Review issues.
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