OSDN Git Service
Bill Yi [Mon, 25 Mar 2019 05:42:50 +0000 (22:42 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
1b82db4c3e -s ours
am skip reason: subject contains skip directive
Change-Id: I384ffeca242db2036570b03af78fb981a6573505
Mark Chien [Mon, 25 Mar 2019 04:10:21 +0000 (21:10 -0700)]
Merge "Fix the race between carrier config and DDS change" am:
36538bb38c
am:
514010fc25
Change-Id: I16c87cb11e92ec2267dfa66c7da2904aa05e3644
Mark Chien [Mon, 25 Mar 2019 03:58:46 +0000 (20:58 -0700)]
Merge "Fix the race between carrier config and DDS change"
am:
36538bb38c
Change-Id: Idf1e5c33560845095028127d6bc3f384471bd4a1
Mark Chien [Mon, 25 Mar 2019 03:48:02 +0000 (03:48 +0000)]
Merge "Fix the race between carrier config and DDS change"
Remi NGUYEN VAN [Mon, 25 Mar 2019 03:11:49 +0000 (20:11 -0700)]
Merge "Separate NetworkMonitor/framework portal URL" am:
bcd3bed561
am:
34198fac89
Change-Id: Ic6c16ccf98e943b7003524f6e2b98e100e543221
Remi NGUYEN VAN [Mon, 25 Mar 2019 03:02:39 +0000 (20:02 -0700)]
Merge "Separate NetworkMonitor/framework portal URL"
am:
bcd3bed561
Change-Id: I1926527f7875e459b4d3c84bfcd8b3aac9562cae
Remi NGUYEN VAN [Mon, 25 Mar 2019 02:57:01 +0000 (19:57 -0700)]
Merge "Fix API in CaptivePortal and ConnectivityManager" am:
3c959339ae
am:
79f2cf93d2
Change-Id: Ibe9d16bbf1e794eb05166ad9c6bccb3ad5bcae9d
Remi NGUYEN VAN [Mon, 25 Mar 2019 02:50:37 +0000 (02:50 +0000)]
Merge "Separate NetworkMonitor/framework portal URL"
Remi NGUYEN VAN [Mon, 25 Mar 2019 02:46:32 +0000 (19:46 -0700)]
Merge "Fix API in CaptivePortal and ConnectivityManager"
am:
3c959339ae
Change-Id: I4cc3c61232c74bafe4eb549c1aba5de20a8bb3ff
Treehugger Robot [Mon, 25 Mar 2019 02:37:28 +0000 (02:37 +0000)]
Merge "Fix API in CaptivePortal and ConnectivityManager"
Chiachang Wang [Mon, 25 Mar 2019 02:36:45 +0000 (19:36 -0700)]
Merge "Add network stack proto" am:
727f8bbfc6
am:
2fa14ae4c0
Change-Id: Ia82ff368e705150015be6f9dad8c1f93fa9ec8c7
Calvin Pan [Mon, 25 Mar 2019 02:31:38 +0000 (19:31 -0700)]
Merge "Marked nullable in setter argument" am:
f5bc344375
am:
2f0ad7bfd6
Change-Id: I02525e27fd9b4da474ff15bf502c49626ba079d2
Chiachang Wang [Mon, 25 Mar 2019 02:26:32 +0000 (19:26 -0700)]
Merge "Add network stack proto"
am:
727f8bbfc6
Change-Id: Ic01456c0860e6435f26b1af48359096db6b63224
Calvin Pan [Mon, 25 Mar 2019 02:17:45 +0000 (19:17 -0700)]
Merge "Marked nullable in setter argument"
am:
f5bc344375
Change-Id: I6eb379b487e85e4523227938a1f1c281b6b1a8ce
Chiachang Wang [Mon, 25 Mar 2019 02:16:16 +0000 (02:16 +0000)]
Merge "Add network stack proto"
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:55:37 +0000 (18:55 -0700)]
Merge "Refactor DhcpErrorEvent error codes" am:
ed2e54a521
am:
150a395303
Change-Id: I6f18975173a21526b3fe8a9c174b16625e1fab0e
Remi NGUYEN VAN [Mon, 25 Mar 2019 01:46:13 +0000 (18:46 -0700)]
Merge "Refactor DhcpErrorEvent error codes"
am:
ed2e54a521
Change-Id: I5bbac5cedb73e1a7705914f190ff22f753791e96
Remi NGUYEN VAN [Fri, 22 Mar 2019 02:14:13 +0000 (11:14 +0900)]
Fix API in CaptivePortal and ConnectivityManager
- Remove CaptivePortal constructor from SystemApi. This constructor was
added in Q timeframe and ends up being unnecessary since
CaptivePortal creation was refactored to ConnectivityService because
of visibility issues on ICaptivePortal.
- Rename getAvoidBadWifi to shouldAvoidBadWifi
- Add permission annotation for shouldAvoidBadWifi
(already merged in internal as:
I09545c00af3519dbf141dd5951b28f49e37b3e80)
Test: flashed, WiFi and captive portal works
Bug:
128935314
Bug:
128935673
Merged-In: I09545c00af3519dbf141dd5951b28f49e37b3e80
Change-Id: I7395d4a4db6a64398a827692aee1956c011873e5
Remi NGUYEN VAN [Mon, 25 Mar 2019 01:33:59 +0000 (01:33 +0000)]
Merge "Refactor DhcpErrorEvent error codes"
Bill Yi [Sun, 24 Mar 2019 16:52:11 +0000 (09:52 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I3fe34039e30e8fe80efc4c0cb9cfb1d373cee7b6
Cody Kesting [Sat, 23 Mar 2019 01:36:14 +0000 (18:36 -0700)]
Merge "Annotate Data and Voice Roaming setters with @TestApi." am:
e1dda15d6c
am:
c028f7a57a
Change-Id: I4976be17b20e7ecc6466303179e53629f2252937
Cody Kesting [Sat, 23 Mar 2019 01:22:15 +0000 (18:22 -0700)]
Merge "Annotate Data and Voice Roaming setters with @TestApi."
am:
e1dda15d6c
Change-Id: I450069925ec6b931d88c964aba4975167531d93d
Treehugger Robot [Sat, 23 Mar 2019 01:03:31 +0000 (01:03 +0000)]
Merge "Annotate Data and Voice Roaming setters with @TestApi."
Michael Wright [Sat, 23 Mar 2019 00:26:57 +0000 (17:26 -0700)]
Merge "Add self to OWNERS for MediaProjection." am:
00ccf23ebd
am:
187bd825b8
Change-Id: Ic59abd88618d5b06dedf5f618a428f8ab1c4f022
Michael Wright [Sat, 23 Mar 2019 00:14:39 +0000 (17:14 -0700)]
Merge "Add self to OWNERS for MediaProjection."
am:
00ccf23ebd
Change-Id: I34369b2d81c8fea7c56000e305ee8f82a18135de
Treehugger Robot [Fri, 22 Mar 2019 23:48:31 +0000 (23:48 +0000)]
Merge "Add self to OWNERS for MediaProjection."
Varun Anand [Fri, 22 Mar 2019 19:02:13 +0000 (12:02 -0700)]
[automerger skipped] Merge "Revert "Revert "Update VPN capabilities when its underlying network set is null.""" into pi-dev
am:
ddaa6338c8 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1
4fa80e8a2f is in history
Change-Id: I0634f41f9b3be7cc640b31ab3067708f99759831
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
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
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
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
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:35:02 +0000 (06:35 -0700)]
Merge "Add @UnsupportedAppUsage annotations" am:
88e2a9aaee
am:
02f43694e4
Change-Id: Id5e95d173ab7c2595ae148f73d3d7381b0ea8226
Andrei-Valentin Onea [Fri, 22 Mar 2019 13:25:44 +0000 (06:25 -0700)]
Merge "Add @UnsupportedAppUsage annotations"
am:
88e2a9aaee
Change-Id: I63ae22279aa46522b652cdc9329567a04a7ef136
Andrei-Valentin Onea [Fri, 22 Mar 2019 13:12:41 +0000 (13:12 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
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
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:36:49 +0000 (04:36 -0700)]
Merge "Add telephony sources to hiddenapi-mappings"
am:
824c531396
Change-Id: Ic5a0a2600dcdd030139f0c50e3b445053ba2c2c5
Andrei-Valentin Onea [Fri, 22 Mar 2019 11:24:50 +0000 (11:24 +0000)]
Merge "Add telephony sources to hiddenapi-mappings"
markchien [Tue, 19 Mar 2019 12:57:04 +0000 (20:57 +0800)]
Fix the race between carrier config and DDS change
Tethering may receive default data subscription change when
carrier config don't load yet. Don't reevaluate provisioning
for this transient "carrier config not loaded" time. Assume
tethering will receive carrier config change and process
provisioning reevaluation after carrier config loaded.
Fix:
128650184
Test: -build, flash, boot
-atest FrameworksNetTests
-manual test with Google Fi
Change-Id: I9e66fe2cbc340ba7477283bea7853ff15f41dd81
Jack Yu [Fri, 22 Mar 2019 09:41:17 +0000 (02:41 -0700)]
Merge "Renamed the variable" am:
afa94f4664
am:
f2a8ea192c
Change-Id: I915e00c7392e31180099abf35982cc1a5a3ffc17
Jack Yu [Fri, 22 Mar 2019 09:32:18 +0000 (02:32 -0700)]
Merge "Renamed the variable"
am:
afa94f4664
Change-Id: I688d8126bb0207f8efcccba3e9857144e3f6067b
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:21:21 +0000 (00:21 -0700)]
Merge "Fix targetSdkVersion for NetworkStack" am:
42b97de9d3
am:
ba2f3d2fdf
Change-Id: I7be8a9f1020d56cdf9ac87a47a25cab77d66958e
Remi NGUYEN VAN [Fri, 22 Mar 2019 07:12:43 +0000 (00:12 -0700)]
Merge "Fix targetSdkVersion for NetworkStack"
am:
42b97de9d3
Change-Id: Id9786b9d607950990427316379c3bb46bf188703
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 06:17:16 +0000 (23:17 -0700)]
Merge "Add NETWORK_SCAN permission" am:
419956210a
am:
3f7de4bc99
Change-Id: Ic69dd3d51ac2038ff5291ec6ce3bd176c66b9d31
Remi NGUYEN VAN [Wed, 20 Mar 2019 05:22:49 +0000 (14:22 +0900)]
Separate NetworkMonitor/framework portal URL
The framework cannot return URLs used by the updatable NetworkStack,
which may use configurable URLs, changing URLs, or mechanisms not
involving URLs to detect captive portals. NetworkMonitor has already
been using random fallback URLs for a while that do not match the value
returned by ConnectivityManager#getCaptivePortalServerUrl.
With this change, the default value returned by the framework is
configured in framework resources as
config_networkDefaultCaptivePortalServerUrl. NetworkMonitor behavior may
change as it is an updatable component, but the current URL is
configured in NetworkMonitor resources as
config_captive_portal_http_url.
Test: flashed, booted, WiFi and captive portal working
Test: ConnectivityManager#getCaptivePortalServerUrl returns correct
value.
Bug:
127908503
Change-Id: I371dedc5b22efa909d7fd58e1ebe9b8aaced9780
Hall Liu [Fri, 22 Mar 2019 06:02:09 +0000 (23:02 -0700)]
Merge "Add NETWORK_SCAN permission"
am:
419956210a
Change-Id: Ia9fe0ff68145e1a6bbb5bd903012e1ecb57a3d0b
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:40:39 +0000 (21:40 -0700)]
Merge "Enable PARTIAL_CONNECTIVITY dialog" am:
507d69d5d9
am:
e2f6ad6b48
Change-Id: I2e1947cdf6e084aefd4d2ccd7b345df79c62e383
Lucas Lin [Fri, 22 Mar 2019 04:30:48 +0000 (21:30 -0700)]
Merge "Enable PARTIAL_CONNECTIVITY dialog"
am:
507d69d5d9
Change-Id: I88ca44ef0c0a7cf48538421022d0fed10d15fc26
Lucas Lin [Fri, 22 Mar 2019 04:17:43 +0000 (04:17 +0000)]
Merge "Enable PARTIAL_CONNECTIVITY dialog"
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
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
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:42:46 +0000 (18:42 -0700)]
Merge "Modify SettingsLib for partial connectivity" am:
64bb980f45
am:
1eb23ba267
Change-Id: I8b6c1ef312c0b79f41ebbfe17eaccfa535ac0597
Lucas Lin [Fri, 22 Mar 2019 01:30:59 +0000 (18:30 -0700)]
Merge "Modify SettingsLib for partial connectivity"
am:
64bb980f45
Change-Id: I8a66d66ca058613a3a173593c64c789c55269c88
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 01:05:52 +0000 (18:05 -0700)]
Merge changes from topic "iwlan_api_review" am:
ac3406f9c6
am:
8a6dbb8446
Change-Id: Ie30207bae71e1c45a9d2ae76132c3012f9f5dd37
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
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
Lorenzo Colitti [Fri, 22 Mar 2019 00:47:26 +0000 (17:47 -0700)]
Merge changes I2e8c2ad9,Ic4f4c7d2 am:
0c089bcc82
am:
9b86ed3c65
Change-Id: I068d2eb07d57779dda4d7b9e5bcd94e0ee8dc686
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
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.
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
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
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
Nathan Harold [Thu, 21 Mar 2019 23:44:22 +0000 (16:44 -0700)]
Merge "Expose CellInfoTdscdma" am:
0b88e07ea5
am:
2c3dba9194
Change-Id: Iafbadf538af679b87ed4be9831b21562ff701fab
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 22:07:39 +0000 (15:07 -0700)]
Merge "Deprecate SystemApi that was accidently made public in P" am:
18870b2e4e
am:
1cb491e423
Change-Id: Ieafcc2c15eb0b7a2968faf979fe93e31088e86b5
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"
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 19:19:47 +0000 (12:19 -0700)]
Merge "Modified MultiSim APIs" am:
c5461c4490
am:
be4d9657a7
Change-Id: I9aa4e0231b7f546f8e26ba9a77c20f4e4a89dc86
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"
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
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
Jordan Liu [Thu, 21 Mar 2019 18:14:33 +0000 (11:14 -0700)]
Merge "Update documentation" am:
ae25b62203
am:
ea992811ff
Change-Id: Ic4d2927b28a1684f2bd926be8c27b2215104d5c6
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
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
OSDN Git Service
