Commit Graph

4548 Commits

Author SHA1 Message Date
Hall Liu
108bfdc042 Merge "Expose and update the call forward/waiting APIs" 2020-09-22 01:10:47 +00:00
Hall Liu
32634e1454 Expose and update the call forward/waiting APIs
Expose the call forwarding and call waiting APIs, update their
documentation, and convert them to async APIs due to their dependence on
network communication.

Fixes: 168655869
Test: atest android.telephony.cts.TelephonyManagerTest
Change-Id: Ic20bc99314c8538a3f75f6af9c37bc4d30781825
2020-09-21 13:49:25 -07:00
Brad Ebinger
ed08adf82b Merge "Decouple the ImsFeature status listener from creating the feature" am: d259885f8a am: 1ee8c01f2f am: 16288d636f am: 5087fa7156 am: 90281441a3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427468

Change-Id: I6c4587230b49e5eda10fa5cba0c50edc86db0ea4
2020-09-18 05:12:07 +00:00
Brad Ebinger
03a843a281 Decouple the ImsFeature status listener from creating the feature
Add the listener after the ImsFeature has been created to ensure
that listeners do not miss the state update due to the feature not
being tracked internally yet.

(This is part 1 of a two part process to clean up ImsFeature
connecting).

Test: atest CtsTelephonyTestCases FrameworksTelephonyTests ImsCommonTests
Change-Id: I6a0cf4a4dfae2593ea77d3b098cd7a93325ea740
2020-09-15 11:22:30 -07:00
Xin Li
628590d7ec Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I3d92a6de21a938f6b352ec26dc23420c0fe02b27
Change-Id: Ifdb80563ef042738778ebb8a7581a97c4e3d96e2
2020-08-31 21:21:38 -07:00
zoey chen
c647fa10a9 [TelephonyMainline] Make getMergedSubscriberIdsFromGroup as System API and rename it
Bug: 145584030
Test: make
Merged-In: I6c077f3bee6bfd4d5b215aca4e9b19b719772b29
Change-Id: I6c077f3bee6bfd4d5b215aca4e9b19b719772b29
2020-08-27 15:57:57 -07:00
TreeHugger Robot
612be42e0a Merge "Rename setDataEnabledWithReason" 2020-08-20 01:23:57 +00:00
Meng Wang
f3c71997ee Add KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID
Bug: 164250692
Test: make
Change-Id: I917085cf6f962c7f5cc7088e2e5298597f661514
Merged-In: I917085cf6f962c7f5cc7088e2e5298597f661514
2020-08-18 02:22:11 +00:00
Meng Wang
6e39f4af67 Add KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID
Bug: 164250692
CTS-Coverage-Bug: 164250692
Test: make
Change-Id: I917085cf6f962c7f5cc7088e2e5298597f661514
2020-08-17 21:25:26 +00:00
Tyler Gunn
c0e4e1581a Merge "Update language to comply with Android's inclusive language guidance" am: a005cb30ed am: 3772a5b3fd am: c5ef3b9cae am: 03921ada7b am: dc82235933
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1377136

Change-Id: I99fa531f570a13fd3a27abf522383e631f86ceed
2020-07-31 01:16:30 +00:00
Tyler Gunn
c5ef3b9cae Merge "Update language to comply with Android's inclusive language guidance" am: a005cb30ed am: 3772a5b3fd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1377136

Change-Id: I2f838a951cec8f6e7af82a0cd08d99d6045f3952
2020-07-30 21:25:38 +00:00
Tyler Gunn
a005cb30ed Merge "Update language to comply with Android's inclusive language guidance" 2020-07-30 20:42:55 +00:00
Tyler Gunn
460360d6b8 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Test: Presubmit
Bug: 161896447
Change-Id: I4142f4819f5ed3e2ffddf471b90923985e72523a
2020-07-29 10:23:07 -07:00
Sooraj Sasindran
e6e49b59cc Rename setDataEnabledWithReason
1. Rename setDataEnabledWithReason to
setDataEnabledForReasn

2. Allow isDataConnectionAllowed to be accessed by
same apps as isDataEnabledForReason

3. Make these apis public

Bug: 156332911
Test: cts and build
Change-Id: I8672ab8861fdec1854427ee9ce5ad8eec8774608
2020-07-17 20:36:48 +00:00
Treehugger Robot
31c549572d Merge "Fix some style issues" am: 1b87c970c8 am: 9a155b957a am: 9006230a7e am: e8673429a4 am: 874cda3d9f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313803

Change-Id: Id7f2e98c158488467027040f31e6113cd26c8e5c
2020-07-14 11:55:54 +00:00
Treehugger Robot
5a01773c04 Merge "Suppress showing "Invalid Validity Period-1" for sending messages" am: 8daa4a1389 am: ee59d3306a am: a7a04f6c5c am: b0c6b9f62e am: 6ac6f9210a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313804

Change-Id: I9414716f1eae6b0ddc9ac88b3d930fd8a62dd184
2020-07-14 11:33:50 +00:00
Treehugger Robot
9006230a7e Merge "Fix some style issues" am: 1b87c970c8 am: 9a155b957a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313803

Change-Id: I0269a40f6984fa61522b0fb48aa1a66f1906683b
2020-07-14 11:16:21 +00:00
Treehugger Robot
a7a04f6c5c Merge "Suppress showing "Invalid Validity Period-1" for sending messages" am: 8daa4a1389 am: ee59d3306a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313804

Change-Id: Ic7c6ffe1943ccbe7d79633fc6d2f29ef6f4e75a1
2020-07-14 10:50:04 +00:00
Treehugger Robot
1b87c970c8 Merge "Fix some style issues" 2020-07-14 10:45:39 +00:00
Taesu Lee
1ec60185f8 Suppress showing "Invalid Validity Period-1" for sending messages
Show the error log when only wrong value is set actually for sending
instead.
And it includes some cleanup.

Bug: 161156510
Test: MO SMS and check log

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: I2b58b431c59c52dd05cfa54ac34551550cd614d2
2020-07-14 16:05:44 +09:00
Taesu Lee
2238af8e30 Fix some style issues
Test: build

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: I119d6351057d91a11c9bb58ea6b469807f469c38
2020-07-14 12:13:24 +09:00
Treehugger Robot
f46f69c53d Merge "Ignore invalid time stamp in SMS PDUs" am: a19cd20f01 am: 43887910a2 am: 2d017866f1 am: e8589e5764 am: 662dbdd587
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354342

Change-Id: Ic8476f8ffe8f9d95cbf5c540605c30badbe69cd6
2020-07-13 09:35:07 +00:00
Treehugger Robot
2d017866f1 Merge "Ignore invalid time stamp in SMS PDUs" am: a19cd20f01 am: 43887910a2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354342

Change-Id: I74bcc259c8764f969a7328ff97bec20aeeabf036
2020-07-13 08:39:07 +00:00
Treehugger Robot
a19cd20f01 Merge "Ignore invalid time stamp in SMS PDUs" 2020-07-13 08:10:24 +00:00
Shuo Qian
47351ebc1b Merge "Fix a Sms7BitEncodingTranslator threading issue, since translate() method can easily race when called by multiple threads." am: 02b664649a am: 1609733fae
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360883

Change-Id: Ia8d0608b3ef8291030a8131b732dee2eff2c8745
2020-07-13 02:33:38 +00:00
Shuo Qian
d2767b1be0 Merge "Fix a Sms7BitEncodingTranslator threading issue, since translate() method can easily race when called by multiple threads." into rvc-qpr-dev am: 22b4b7c111 am: 710e07bf63
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12129459

Change-Id: I343485fb7f7afa0b18f8b1a6908a0652251e8a41
2020-07-10 20:25:25 +00:00
Jeff Sharkey
d8d6992c07 Fix a Sms7BitEncodingTranslator threading issue, since translate() method can easily race when called by multiple threads.
Bug: 160733170
Test: Sanity; Telephony unit tests; hard to reproduce
Change-Id: If8347a27a79351e84060c9a35e1cc9efd468f7a0
Merged-In: If8347a27a79351e84060c9a35e1cc9efd468f7a0
(cherry picked from commit 131781145d)
2020-07-10 20:16:02 +00:00
Shuo Qian
710e07bf63 Merge "Fix a Sms7BitEncodingTranslator threading issue, since translate() method can easily race when called by multiple threads." into rvc-qpr-dev am: 22b4b7c111
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12129459

Change-Id: Id8effff77be4d89335b433b6bc74adc586d525cf
2020-07-10 20:09:40 +00:00
Jeff Sharkey
131781145d Fix a Sms7BitEncodingTranslator threading issue, since translate() method can easily race when called by multiple threads.
Bug: 160733170
Test: Sanity; Telephony unit tests; hard to reproduce
Change-Id: If8347a27a79351e84060c9a35e1cc9efd468f7a0
2020-07-10 18:01:37 +00:00
Treehugger Robot
36517955c1 Merge "Delete newFromCMT() and newFromCDS() from SmsMessage" am: b599edc541 am: b403b0877d am: 5850cbdfad am: 57c6c1b17c am: 7c2a2c11a6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359205

Change-Id: Icb198229a6950e50338b2455909d8e1b6852c3a2
2020-07-10 07:56:56 +00:00
Treehugger Robot
5850cbdfad Merge "Delete newFromCMT() and newFromCDS() from SmsMessage" am: b599edc541 am: b403b0877d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359205

Change-Id: I05e4806aca68c0b42912834a6da1976443846c56
2020-07-10 07:16:52 +00:00
Treehugger Robot
b599edc541 Merge "Delete newFromCMT() and newFromCDS() from SmsMessage" 2020-07-10 06:48:53 +00:00
Sooraj Sasindran
dc52bd51d8 Merge "Add hidden API to support allowed networks reason" 2020-07-09 22:40:37 +00:00
Hall Liu
175ff6c574 Merge "Update docs for ACTION_SIM_STATE_CHANGED" 2020-07-09 18:35:02 +00:00
Nathan Harold
cb431f9646 Merge changes from topic "servicelocation" am: 63ced6b508 am: 0b41b930a8 am: dbe2b4c8a9 am: d307f437a6 am: 82f17301c2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1355808

Change-Id: Id7f6f8125ca3b648a62224593a33c82250258e7a
2020-07-09 18:14:37 +00:00
Nathan Harold
3b7682b06d Add Location Checks on CellLocation#requestLocationUpdate am: 32deda2df3 am: 3b7647b8d6 am: b169887af7 am: cf4bcdca28 am: e63cf87032
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1355807

Change-Id: Iec22786a5ad824d3f5e791ffbc2b47be81c22a2d
2020-07-09 18:14:28 +00:00
Nathan Harold
dbe2b4c8a9 Merge changes from topic "servicelocation" am: 63ced6b508 am: 0b41b930a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1355808

Change-Id: I1992b4e1c9d7c2cf442515b4c397a9975478df85
2020-07-09 17:34:30 +00:00
Nathan Harold
b169887af7 Add Location Checks on CellLocation#requestLocationUpdate am: 32deda2df3 am: 3b7647b8d6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1355807

Change-Id: I44159f46bb114dcc181e4974fabcc22c881b5395
2020-07-09 17:34:25 +00:00
Taesu Lee
c483107ac7 Delete newFromCMT() and newFromCDS() from SmsMessage
Bug: 160847655
Test: build

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: Ie451a24ef6b6c03ee8668fb055d83c7cc4175cdb
2020-07-09 19:23:27 +09:00
Sooraj Sasindran
23eda90058 Add hidden API to support allowed networks reason
Add hidden API to support allowed networks type for
specific reason like power.

Bug: 156709797
Test: system test
Merged-In: If4424d7d94ac26ad31725a1658dad5751d0d2629
Change-Id: If4424d7d94ac26ad31725a1658dad5751d0d2629
2020-07-08 23:23:05 -07:00
Hall Liu
4a0578fc5a Update docs for ACTION_SIM_STATE_CHANGED
Update docs for ACTION_SIM_STATE_CHANGED to reflect its
deprecated/frozen status.

Bug: 159346708
Test: N/A
Change-Id: I48e08432884a6f6eafdd3c9071d260fe7275c2e4
2020-07-08 15:54:33 -07:00
Nathan Harold
0459eb7cdc Remove Support for Deprecated Location Updating
Remove support for location update control that impacts
the services state tracker. This functionality hasn't been
needed in many years, and it has the ability to:
-consume additional battery
-cause ServiceState to be reported incorrectly
-cause the phone to not know about changes to
 the service state (current cell, technology, etc).

Bug: 152648516
Test: compilation - code removal only
Change-Id: I1bf880c037b5c005bdd61a0ff6f5c4000ec2f9be
2020-07-06 13:54:20 -07:00
Nathan Harold
32deda2df3 Add Location Checks on CellLocation#requestLocationUpdate
Update CellLocation#requestLocationUpdate to pass the necessary
information to do soft location permission checks and bill
modem battery usage against the caller of the API.

Bug: 152648516
Test: atest CellLocationTest
Change-Id: Id9e354538953ef93193a937a834e5890e62ecebd
2020-07-06 13:54:15 -07:00
Taesu Lee
3e3baa0b9d Ignore invalid time stamp in SMS PDUs
Catch a DateTimeException so that we don't lose SMS PDUs even if they
have invalid time stamp caused by SMSC problems.

Bug: 160200121
Test: Received SMS having invalid time stamp

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: I80ef1c134f49d6a23e87a77125f54f4f66d62023
2020-07-02 16:50:08 +09:00
TreeHugger Robot
6f000e189b Merge "Reset cell broadcast config before enabling all channels" into rvc-dev 2020-06-19 22:02:39 +00:00
Jack Yu
e9c44278c5 Reset cell broadcast config before enabling all channels
Before cell broadcast config service enabling all channels, it
reset all channels that were previously enabled. This will make
sure the full channel config can be pushed down to modem. This
also solved the issue that channel config not sending to modem
when SIM is swapped. Note that a hidden API is added and will
be unhide in the next Android release.

Fix: 155027085
Test: Manual
Merged-In: Id571b990f4e45aea5bbab0dbadce48dda7b2bc56
Change-Id: Id571b990f4e45aea5bbab0dbadce48dda7b2bc56
2020-06-19 19:46:31 +00:00
Brad Ebinger
3afcd20f6a Fix MmTelFeatureConnection Memory Leak
In FeatureConnection, we never cleaned up the ImsFeatureStatusCallback
after it was destroyed, leaving zombie FeatureConnections around.

Bug: 156893040
Fixes: 157948894
Test: atest FrameworksTelephonyTests
Merged-In: Idcf8b558c3807a3f9f5094afee532e76ea6f02cb
Change-Id: Idcf8b558c3807a3f9f5094afee532e76ea6f02cb
2020-06-19 10:57:04 -07:00
Jack Yu
88fb45c1a9 Reset cell broadcast config before enabling all channels
Before cell broadcast config service enabling all channels, it
reset all channels that were previously enabled. This will make
sure the full channel config can be pushed down to modem. This
also solved the issue that channel config not sending to modem
when SIM is swapped. Note that a hidden API is added and will
be unhide in the next Android release.

Fix: 155027085
Test: Manual
Merged-In: Id571b990f4e45aea5bbab0dbadce48dda7b2bc56
Change-Id: Id571b990f4e45aea5bbab0dbadce48dda7b2bc56
2020-06-17 15:47:23 -07:00
Jack Yu
4581e809ad Reset cell broadcast config before enabling all channels
Before cell broadcast config service enabling all channels, it
reset all channels that were previously enabled. This will make
sure the full channel config can be pushed down to modem. This
also solved the issue that channel config not sending to modem
when SIM is swapped. Note that a hidden API is added and will
be unhide in the next Android release.

Fix: 155027085
Test: Manual
Change-Id: Id571b990f4e45aea5bbab0dbadce48dda7b2bc56
2020-06-17 22:44:37 +00:00
Automerger Merge Worker
f09c9025d5 Merge "Merge "Add hidden API to support allowed networks reason" into rvc-dev am: 06e61f7cd5 am: fd75704133 am: b837404a61" into rvc-qpr-dev-plus-aosp am: 42444626c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11712805

Change-Id: I7c703ae7a4741a9192805ece61865b91eef120f0
2020-06-13 04:03:31 +00:00