OSDN Git Service
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 [Mon, 25 Mar 2019 01:33:59 +0000 (01:33 +0000)]
Merge "Refactor DhcpErrorEvent error codes"
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: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."
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: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 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"
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: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: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: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 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: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 00:50:56 +0000 (17:50 -0700)]
Merge changes from topic "iwlan_api_review"
am:
ac3406f9c6
Change-Id: I39775146064de0041c963a460f20a65e94fa6e78
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 [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"
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: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."
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
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
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)