Commit Graph

4074 Commits

Author SHA1 Message Date
SongFerng Wang
341b8c38da Merge "isTetherApnRequired api rename as isTetheringApnRequired" am: 25ea00d059 am: c4bb6df605
am: 1877b8226d

Change-Id: Ie5aa119857b940abb838f5cb0baf6ba294eb896a
2019-11-20 02:24:15 -08:00
SongFerng Wang
1877b8226d Merge "isTetherApnRequired api rename as isTetheringApnRequired" am: 25ea00d059
am: c4bb6df605

Change-Id: I8de3f03e2443eafc072650cb362f82e4bed94aa8
2019-11-20 02:18:08 -08:00
SongFerng Wang
25ea00d059 Merge "isTetherApnRequired api rename as isTetheringApnRequired" 2019-11-20 08:46:05 +00:00
Meng Wang
1db82317c0 Merge "Move GsmAlphabet to telephony/common" am: 36a15245e9 am: c68e65ed1a
am: 99a254e353

Change-Id: I470e99f1dd7e7055ab88840087c2470f98d50629
2019-11-19 20:32:34 -08:00
Meng Wang
99a254e353 Merge "Move GsmAlphabet to telephony/common" am: 36a15245e9
am: c68e65ed1a

Change-Id: I5cf5e4b0610d68276ce5931a0321bc12139a2253
2019-11-19 19:39:20 -08:00
Meng Wang
36a15245e9 Merge "Move GsmAlphabet to telephony/common" 2019-11-20 03:21:19 +00:00
Jordan Liu
f85b6a2def Merge "Expose Geometry, LatLng, and maxWaitDuration" am: e993fb8bb9
am: 2ca04cf384

Change-Id: Iaef98dc98f7caf25f4279b768f11937d15f7a947
2019-11-19 15:51:19 -08:00
Hall Liu
ae63546d19 Merge commit '1d7a53da981b7d4281c58af7eb9b150163b344a6' into manual_merge_1d7a53da981b7d4281c58af7eb9b150163b344a6
am: dab3711435

Change-Id: Ib75482a87545f7743f0049c8e51c354d2294c2af
2019-11-19 15:12:28 -08:00
Meng Wang
3312d7cfa7 Move GsmAlphabet to telephony/common
so it can be shared with non-telephony modules.

Test: make
Bug: 140908357
Change-Id: I8caba6a1ac3943e7f0044f7502eead10dfe8669c
2019-11-19 14:19:41 -08:00
Jordan Liu
e993fb8bb9 Merge "Expose Geometry, LatLng, and maxWaitDuration" 2019-11-19 20:55:36 +00:00
Artur Satayev
785d3a03b9 Merge "Add @UnsupportedAppUsage annotations for greylist." 2019-11-19 15:05:51 +00:00
Artur Satayev
751e55114c Add @UnsupportedAppUsage annotations for greylist.
go/cleanup-greylist-txt

These have already been greylisted, however due to bugs/omissions in the tooling have been kept in go/greylist-txt instead of being annotated in the code.

This is partial merge of aosp/Id6c1f5e403a0e66edb1102ee45f3bf19f244fb09. Telephony greylist cleanup has been done separately. Note that annotations outside of frameworks/base/ have been merged from AOSP.

Bug: 137350495
Test: m
Exempt-From-Owner-Approval: merge
Change-Id: I015c466e8b69cc0fed5e9d394ba865aad11d8ba6
2019-11-19 15:05:35 +00:00
Hall Liu
1d7a53da98 Merge changes from topic "mainline4"
* changes:
  Add new API for Telecom to send phone state
  Minor style correction to avoid merge conflict
  non-mainline telephony related AIDL refactor/decoupling
2019-11-18 22:31:27 +00:00
Chen Xu
f08074d6ec Merge "SystemAPI for ACTION_SMS_EMERGENCY_CB_RECEIVED intent" am: 3c397a6217
am: 42d7faea52

Change-Id: If8ab3835f050dee774a4fbcbaca3febf07fec049
2019-11-18 11:23:06 -08:00
Chen Xu
39b95941f9 SystemAPI for ACTION_SMS_EMERGENCY_CB_RECEIVED intent
Bug: 135956699
Test: Build
Change-Id: Ic7124f30fae6faa482467fd9235ef6155854f589
(cherry picked from commit 9c1260c818)
Merged-in: Ic7124f30fae6faa482467fd9235ef6155854f589
2019-11-16 09:21:33 -08:00
Jordan Liu
b3591333f7 Expose Geometry, LatLng, and maxWaitDuration
Expose Geometry and LatLng classes as SystemApi
Expose maxWaitDuration, which is used in the cell broadcast service
geofencing logic.

Bug: 135956699
Test: make and run appcompat script
Merged-In: Iac585cd54db97c08eccc57adc9721c90aa785fcd
Change-Id: Iac585cd54db97c08eccc57adc9721c90aa785fcd
(cherry picked from commit a8ec03ebe6)
2019-11-16 07:56:30 -08:00
Chen Xu
8eb62f9485 non-mainline telephony related AIDL refactor/decoupling
1. decouple IOnSubscriptionChangedListener AIDL from telephonyMainline
2. other refactor. moving APIs which will not be included in
telephony mainline to frameworks/base/core/java/android/telephony.
Moving internal classes like AIDL which will not be included in
telephony mainline to
framework/base/core/java/com/android/internal/telephony

Bug: 140908357
Test: Build & unit test
Change-Id: I9413ef758cceadd251d03f3b5ea1054cc48ef044
Merged-In: I9413ef758cceadd251d03f3b5ea1054cc48ef044
2019-11-15 18:02:40 -08:00
SongFerngWang
8a90fc0811 isTetherApnRequired api rename as isTetheringApnRequired
Bug: 144455789
Test: Build pass.
      atest TetheringConfigurationTest (PASS)

Change-Id: I9ab4c7b3aef0619046d7e3d711683dbe1f31bb50
2019-11-15 14:50:52 +08:00
Philip P. Moltmann
33692f734f Pipe through featureId from caller to permission checks in telephony
code

A featureId is only used by runtime permissions.

Test: atest FrameworksTelephonyTests CtsAppOpsTestCases
Bug: 136595429
Change-Id: I7ef41e8961e48d40e5685c4a521e83cb20953e48
2019-11-14 13:40:55 -08:00
SongFerng Wang
3e5b9ac2b6 Merge "[mainline] Expose getTetherApnRequired API as system API" am: 3887ca1f22
am: fa3008c39d

Change-Id: I11ed0e214003758fe9116dff520221b09c0171b6
2019-11-11 14:42:48 -08:00
SongFerng Wang
3887ca1f22 Merge "[mainline] Expose getTetherApnRequired API as system API" 2019-11-11 22:06:49 +00:00
Chen Xu
5a04c0d7b8 Merge "SystemAPI for ACTION_SMS_EMERGENCY_CB_RECEIVED intent" 2019-11-11 18:33:01 +00:00
Artur Satayev
756d3b447a Merge "Add @UnsupportedAppUsage annotations for greylist." am: 423c3a32d6
am: 7a565c45b1

Change-Id: I48075ef4296e0b55c0055f7364c5129bbd60e9ed
2019-11-11 09:33:13 -08:00
TreeHugger Robot
5edd93298e Merge "Use sysprop library for telephony props" 2019-11-11 02:11:48 +00:00
Xiangyu/Malcolm Chen
f737318cd0 Merge "Don't allow reading IMSI of one active sub if only has carrier privilege on the other." into qt-qpr1-dev am: d11b16f756
am: f1581e4de4

Change-Id: I1c998f9361247cb4532af3b4e12f5b5f66b63726
2019-11-08 17:30:47 -08:00
Xiangyu/Malcolm Chen
f1581e4de4 Merge "Don't allow reading IMSI of one active sub if only has carrier privilege on the other." into qt-qpr1-dev
am: d11b16f756

Change-Id: I7643243c98263f99a400df450eb35b925028d3cd
2019-11-08 17:25:10 -08:00
Xiangyu/Malcolm Chen
d11b16f756 Merge "Don't allow reading IMSI of one active sub if only has carrier privilege on the other." into qt-qpr1-dev 2019-11-09 01:07:49 +00:00
Malcolm Chen
4bff428285 Don't allow reading IMSI of one active sub if only has carrier privilege
on the other.

Bug: 136123413
Test: unittest
Change-Id: I67a0121d3e965f193be9e827533646423502fe70
2019-11-08 13:41:24 -08:00
Artur Satayev
3be4d59369 Merge "Add @UnsupportedAppUsage annotations for max-p." am: 8893f158c6
am: da4d6567c2

Change-Id: Iff80c388dec2c6f8184b739be6fb38b8ec8a1a49
2019-11-08 09:49:03 -08:00
Artur Satayev
fc46be7dbd Add @UnsupportedAppUsage annotations for greylist.
go/cleanup-greylist-txt

These have already been greylisted, however due to bugs/omissions in the tooling have been kept in go/greylist-txt instead of being annotated in the code.

Bug: 137350495
Test: m

Change-Id: Id6c1f5e403a0e66edb1102ee45f3bf19f244fb09
Merged-In: Id6c1f5e403a0e66edb1102ee45f3bf19f244fb09
2019-11-08 16:17:13 +00:00
Artur Satayev
ee9c6e7571 Add @UnsupportedAppUsage annotations for max-p.
See go/UnsupportedAppUsage for more details.

These have already been greylisted, however due to bugs/omissions in the tooling have been kept in go/greylist-txt instead of being annotated in the code.

Bug: 137350495
Test: m
Change-Id: I5aa29a49b193db47aaee4d3a756c17f48cc9f0b1
Merged-In: I5aa29a49b193db47aaee4d3a756c17f48cc9f0b1
2019-11-08 16:17:13 +00:00
SongFerngWang
fc453e1768 [mainline] Expose getTetherApnRequired API as system API
1. getTetherApnRequired API rename to isTetherApnRequired.
2. Expose isTetherApnRequired API as system API.

Bug: 142365448
Test: Build pass.
      atest TetheringConfigurationTest (PASS)

Change-Id: Iafb2e4fbddb0251e23673742d990ad098a8ae375
Merged-In: Iafb2e4fbddb0251e23673742d990ad098a8ae375
2019-11-08 19:28:33 +08:00
SongFerng Wang
1b3cfb1b88 Merge "[mainline] Expose getTetherApnRequired API as system API" 2019-11-08 11:17:49 +00:00
SongFerngWang
a571f9b827 [mainline] Expose getTetherApnRequired API as system API
1. getTetherApnRequired API rename to isTetherApnRequired.
2. Expose isTetherApnRequired API as system API.

Bug: 142365448
Test: Build pass.
      atest TetheringConfigurationTest (PASS)

Change-Id: Iafb2e4fbddb0251e23673742d990ad098a8ae375
2019-11-08 14:22:38 +08:00
Inseob Kim
1b5e241b92 Use sysprop library for telephony props
Bug: 117924132
Bug: 141246285
Test: lunch blueline-userdebug; m checkbuild
Change-Id: Idefa10b5bdeaff69496bc66730a7398258f3a38e
2019-11-08 15:06:37 +09:00
Jack Yu
2757d63972 Merge "Fixed incorrect WAC decoding" into qt-qpr1-dev am: fa35152703
am: 917396bf71

Change-Id: Icc2d314e9ddf444f29970dda52d6916e7c6b3f7b
2019-11-07 14:06:51 -08:00
Jack Yu
917396bf71 Merge "Fixed incorrect WAC decoding" into qt-qpr1-dev
am: fa35152703

Change-Id: I024c4bff8b733fdf2216cdd16164a2d880aaf91b
2019-11-07 14:01:06 -08:00
Chen Xu
9c1260c818 SystemAPI for ACTION_SMS_EMERGENCY_CB_RECEIVED intent
Bug: 135956699
Test: Build
Change-Id: Ic7124f30fae6faa482467fd9235ef6155854f589
2019-11-07 13:41:07 -08:00
Jack Yu
6586ad9e80 Fixed incorrect WAC decoding
Fixed the incorrect warning area coordinate decoding
when data length is greater than 127 bytes.

Bug: 143762197
Test: unit test
Change-Id: I498ccd0933f31898d531dcea307e160ae94653e8
2019-11-07 11:13:31 -08:00
Jordan Liu
83f70208d1 Merge "Expose Geometry, LatLng, and maxWaitDuration" 2019-11-06 17:15:41 +00:00
Brad Ebinger
87f76cc002 Merge "Add new API for call line identification query responses" 2019-11-04 21:07:29 +00:00
Amit Mahajan
c7f1b38dcd Merge "Move MmsManager and IMms to frameworks/base/mms" 2019-11-04 20:25:14 +00:00
Jordan Liu
234ede4445 Merge "Pass bearerData and serviceCategory to CB module for CDMA" 2019-11-04 20:14:15 +00:00
Amit Mahajan
153d31bc37 Move MmsManager and IMms to frameworks/base/mms
Test: basic sanity
Bug: 140763963
Merged-in: Ib2cffce98f62913c3e50c59b63012c39d595d9ce
Change-Id: Ib2cffce98f62913c3e50c59b63012c39d595d9ce
(cherry picked from commit 6237a6b35c)
2019-11-04 11:27:49 -08:00
Brad Ebinger
a3e3c595ff Add new API for call line identification query responses
The old API was not well documented and took a Bundle although
all parameters are exposed in ImsSsInfo. Creates a new API
that uses ImsSsInfo. Also add @Deprecated SystemApi definition
for older implementations that still use the old method.

Bug: 122098288
Test: atest FrameworksTelephonyTests
Merged-In: I37c2e643296d82312c9d4ba6e196118260009233
Change-Id: I37c2e643296d82312c9d4ba6e196118260009233
2019-11-04 18:41:13 +00:00
Chen Xu
7a79194fcb Merge "new TelephonyRegistryManager" 2019-11-04 18:21:51 +00:00
Brad Ebinger
4fcb9d206a Merge "Add new API for call line identification query responses" 2019-11-04 17:40:46 +00:00
Amit Mahajan
c7e3bb25b8 Move SmsApplication to telephony/common.
Test: basic sanity
Bug: 140763963
Merged-in: I8662c210319523abe64feaf0610af19fd285c8ca
Change-Id: I8662c210319523abe64feaf0610af19fd285c8ca
(cherry picked from commit 1ec2e61e7f)
2019-11-01 16:40:35 -07:00
Amit Mahajan
ac0fd65067 Create frameworks/base/telephony/common for common non-mainline telephony code.
And move mms util code to the new folder.

Test: basic sanity
Bug: 140763963
Merged-in: I0d92ed3fca1fc186484ea8d3c5d17b6e332e7d22
Change-Id: I0d92ed3fca1fc186484ea8d3c5d17b6e332e7d22
(cherry picked from commit d355153dcb)
2019-11-01 16:21:14 -07:00
Amit Mahajan
8b47b32246 Merge "Remove unused @hide APIs from SmsManager." 2019-11-01 22:48:49 +00:00