Commit Graph

13359 Commits

Author SHA1 Message Date
Hall Liu
2f70f9a721 Merge changes from topic "telephonymanager-data-policy" am: 3a14c6bdcc am: 4e254916f0 am: dacbfa7ed8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469718

Change-Id: Ib9a47b6400f79d50f5875d2614a487e88dd2202f
2020-10-22 22:22:54 +00:00
Hall Liu
c93850ce72 Add new methods for setting mobile data policy am: 83bb093cc5 am: f784eebb36 am: 44eed5a8d9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469717

Change-Id: I1d82f2d70704aad6705de4b74594005f7f6f25c2
2020-10-22 22:22:48 +00:00
Hall Liu
f784eebb36 Add new methods for setting mobile data policy am: 83bb093cc5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469717

Change-Id: I86ace597ffeca7bcb0bb73b2b5ea617df80627ab
2020-10-22 21:14:05 +00:00
Hall Liu
3a14c6bdcc Merge changes from topic "telephonymanager-data-policy"
* changes:
  Remove old methods for mobile data
  Add new methods for setting mobile data policy
2020-10-22 17:27:59 +00:00
Nazanin Bakhshi
3798b435ed Merge "initialized carrier_certificate_string_array to an empty array instead of null, so that when a certificate is removed, it is also removed in SubscriptionInfoUpdater#updateSubscriptionByCarrierConfig" am: 12231e3a46 am: fc5c95c7db am: 1218bbd843
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469714

Change-Id: I53d3cea2ff838ba2fdbd0deb8ee8e39ac97a09e6
2020-10-22 07:55:19 +00:00
Brad Ebinger
0bd605173d Merge changes from topics "cp_sip_transport_supported_api", "cp_sip_transport_supported_pipe" am: 9caec78557 am: 371361d995 am: 666fbf6275
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453715

Change-Id: Ief02f6c15576358e18adf4869ad05653a55aa87a
2020-10-22 05:48:24 +00:00
Brad Ebinger
cf96c50b54 Pipe through new SipTransport IInterface to listeners am: c50aeb319a am: 6e0f901a04 am: 28652b0739
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453356

Change-Id: I3c57c30bc37a4fc2aba06371251b771931659eff
2020-10-22 05:48:19 +00:00
Hall Liu
c4587ed1c9 Remove old methods for mobile data
Bug: 169367013
Test: builds
Change-Id: I9aa69c9bd8d31e6bbdd9a237b0aa2c3922431227
Merged-In: I9aa69c9bd8d31e6bbdd9a237b0aa2c3922431227
2020-10-22 01:08:30 +00:00
Hall Liu
83bb093cc5 Add new methods for setting mobile data policy
Add isMobileDataPolicyEnabled and setMobileDataPolicyEnabledStatus in
TelephonyManager. These are intended to replace the mms-always-allowed
and data-during-voice-call setters/getters.

Old methods will be removed in a follow up commit.
Fixes: 169367013
Test: atest TelephonyManagerTest

Change-Id: I6033a84f0a0163e460343ebf603d66078455fe38
Merged-In: I6033a84f0a0163e460343ebf603d66078455fe38
2020-10-21 16:23:34 -07:00
Nazanin
c4eb0d2ff0 initialized carrier_certificate_string_array to an empty array
instead of null, so that when a certificate is removed, it is also
removed in SubscriptionInfoUpdater#updateSubscriptionByCarrierConfig

Bug: 162700101
Test: manual
Change-Id: I921007498f42119581f565fcc6625c1275c59df8
Merged-In: I921007498f42119581f565fcc6625c1275c59df8
2020-10-21 15:45:00 -07:00
Brad Ebinger
4b14954fb4 Add isSupported implementation for SipTransport
Add implementation for SipDelegateManager#isSupported as well
as CTS tests.

Bug: 154763999
Test: atest CtsTelephonyTestCases
Merged-In: I7fbd39a8ff17c4e947fdbcca148857684faa3252
Change-Id: I7fbd39a8ff17c4e947fdbcca148857684faa3252
2020-10-21 13:25:20 -07:00
Brad Ebinger
c50aeb319a Pipe through new SipTransport IInterface to listeners
Create base SipTransport implementation and make it available to
listeners.

Expose new SipDelegate creation capability to the framework from the
ImsService.

The next CL will start the integration of the SipDelegateManager
with the framework and SipTransport.

Bug: 154763999
Test: atest FrameworksTelephonyTests TeleServiceTests
Merged-In: I9a51b850f370a865c9d9109f238e8ed2eea4b6f6
Change-Id: I9a51b850f370a865c9d9109f238e8ed2eea4b6f6
2020-10-21 13:24:22 -07:00
Anton Hansson
24b4d166dd Merge "Remove @TestApi from @SystemApi symbols" am: d2d4637685 am: cbe282347e am: 14897c256d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466264

Change-Id: I859503688ea3254d5bd1b55e80cf1962286e948f
2020-10-20 20:31:58 +00:00
Anton Hansson
dd7d52f963 Remove @TestApi from @SystemApi symbols
I ran these commands:
    cd frameworks/base
    grep -rl '@TestApi' --include '*.java' | xargs perl -i -p0e \
        's/\@SystemApi[\s\n]+(\@\w+[\s\n]+)?\@TestApi/\@SystemApi\1/gs'
    grep -rl '@TestApi' --include '*.java' | xargs perl -i -p0e \
        's/\@TestApi[\s\n]+(\@\w+[\s\n]+)?\@SystemApi/\1\@SystemApi/gs'

Bug: 171179806
Test: m checkapi
Change-Id: I772790b783b0a8730b8bf680c9e569a886b8d789
Merged-In: I772790b783b0a8730b8bf680c9e569a886b8d789
2020-10-19 16:41:01 +01:00
James Lin
3ce250f95f Merge "[RCS UCE] Refactor the class RcsContactUceCapability" am: e279b0d14f am: 8774c473ef am: f0d37bdaba
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459883

Change-Id: I4330bb296c948c9a1d2af78a6ab636cd9b01e95d
2020-10-16 01:42:14 +00:00
James Lin
e279b0d14f Merge "[RCS UCE] Refactor the class RcsContactUceCapability" 2020-10-16 01:15:28 +00:00
James.cf Lin
a1a0f2d860 [RCS UCE] Refactor the class RcsContactUceCapability
Refactor the class RcsContactUceCapability to make it conform to the PIDF format.

Bug: 170785010
Test: atest
Change-Id: Idc2e43c72f1d4ce7afe75a810f3c06f72820d35c
2020-10-16 02:25:45 +08:00
Brad Ebinger
9866c9051a Merge "MMS APIs rely on resolveSubscriptionForOperation()" am: e0ae42884d am: 12d3218ef3 am: b7fd7db377
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456127

Change-Id: I3eeb865f1a9af486833a7c41064e11f71e75f30b
2020-10-14 19:39:47 +00:00
Brad Ebinger
e0ae42884d Merge "MMS APIs rely on resolveSubscriptionForOperation()" 2020-10-14 18:28:48 +00:00
Treehugger Robot
31bdb532c7 Merge "Moved from system API to public API" am: 0a281dd66e am: 5035d227c1 am: 141c011110
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455152

Change-Id: Ib76dd15bbb74e05f25e56667399b40a8eb914e1c
2020-10-13 22:50:54 +00:00
Treehugger Robot
0a281dd66e Merge "Moved from system API to public API" 2020-10-13 21:51:23 +00:00
Nathan Harold
a74f8f021a Merge "Expose MmTelCapabilities#isCapable() as Public API" am: 784c6a8db2 am: f3fa23f787 am: 7e8cbfe8ed
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1314566

Change-Id: Id697fda33b3f778884b2a34d3b369883653983f1
2020-10-13 18:58:02 +00:00
Nathan Harold
784c6a8db2 Merge "Expose MmTelCapabilities#isCapable() as Public API" 2020-10-13 17:14:45 +00:00
Taesu Lee
16bd38d41a MMS APIs rely on resolveSubscriptionForOperation()
A disambiguation dialog will be shown if default SmsManager is used for
MMS as well.

Bug: 170591590
Test: Manual

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: I86bb70261eb7fecf3e8b72f0df8d2338bab4bb57
2020-10-13 07:26:01 +00:00
Jack Yu
6f25ca88db Moved from system API to public API
Fix: 170226261
Test: Manual
Change-Id: Icef3bd23dbd79d60c1d8edc5ce8df07e642d146c
2020-10-12 22:25:31 -07:00
Treehugger Robot
f8cb55dfd1 Merge "Update docs and add nullability annotations" am: 9c0f722e2e am: c7898c9355 am: 3f75fdeb9d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455141

Change-Id: I76d9768ac5376c11d3a295f32e846aa97b484a67
2020-10-12 23:07:58 +00:00
Nathan Harold
1ebbc47c0e Expose MmTelCapabilities#isCapable() as Public API
Expose the MmTelCapabilities#isCapable() API to complete
a chain of APIs exposed for debuggability in Android RVC.

Without this API, there is no (public) way for a caller that
receives a capability callback to determine whether a particular
MMTel feature is enabled for a particular IMS Connection.

Bug: 156107100
Test: make update-api && make offline-sdk-docs && make
Test: cts - ImsServiceTest#testCapabilityStatusCallback()
Merged-In: I0a0d72897112460370e6981ae33cef4da6e3ce4b
Change-Id: I0a0d72897112460370e6981ae33cef4da6e3ce4b
(cherry picked from commit 21157d56a9)
2020-10-12 15:11:59 -07:00
Hall Liu
1dc684e4fc Update docs and add nullability annotations
Fixes: 125463584
Test: docs only
Change-Id: I8c39d0e11278d99c6a7364c09b0584797f749b2a
2020-10-12 11:47:50 -07:00
Treehugger Robot
68d12bb775 Merge "Add BinderCacheManager: caches Binder & notifies listeners upon death" am: 1083b7ed57 am: 98e157c405 am: aed2f3e749
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455085

Change-Id: I89c63f5ab4610ff0ffe62e590e6cf593b7deac72
2020-10-09 00:07:14 +00:00
Treehugger Robot
1083b7ed57 Merge "Add BinderCacheManager: caches Binder & notifies listeners upon death" 2020-10-08 22:59:11 +00:00
Brad Ebinger
eb0737961d Add BinderCacheManager: caches Binder & notifies listeners upon death
Adds a BinderCacheManager class, which does the following:
1) Manages a cached Binder node and recreates it when the Binder node dies.
2) Allows Runnables to be associated with the cached Binder,
which will be called when the node dies.
3) Associates the Runnable with an Object key, which can be used to
remove the runnable without needing to keep a separate map
of Object->Runnable pairs when the user unregisters a persistent
listener.

Test: atest CtsTelephonyTestCases FrameworksTelephonyTests:BinderCacheManagerTest
Change-Id: I23a97371435b7aca8153a30997b91bd324a781a0
2020-10-08 13:19:28 -07:00
Brad Ebinger
dd27d93ad6 Merge "Fix un-dismissable incoming call for auto-rejected calls" 2020-10-08 17:48:00 +00:00
Brad Ebinger
9893f1663d Merge changes from topic "redo_ims_poll" am: ec6681c927 am: 58e629fd68 am: 82a16c7900
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449280

Change-Id: I10e60023c1539abd8ac25ea8ed66ef53e06eee41
2020-10-07 19:59:03 +00:00
Brad Ebinger
182dd1f8aa Clean up IMS based interfaces to use a push model instead of poll am: 1e9cc7b2e5 am: 4c8316091f am: 790aaee786
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449279

Change-Id: Ifad722576fa6a2754ea3bb20a34b343faff2213f
2020-10-07 19:58:53 +00:00
Brad Ebinger
4c8316091f Clean up IMS based interfaces to use a push model instead of poll am: 1e9cc7b2e5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449279

Change-Id: Ia942c0ba88d6ba081569540b617d9b79fb758659
2020-10-07 18:41:47 +00:00
Brad Ebinger
ec6681c927 Merge changes from topic "redo_ims_poll"
* changes:
  Remove "one shot" type of FeatureCallback
  Clean up IMS based interfaces to use a push model instead of poll
2020-10-07 17:49:29 +00:00
Treehugger Robot
1f9c268bd5 Merge "Expose getSmsCapacityOnIcc()" am: 4d96662b1f am: bb2a513010 am: fb0444e82c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1293900

Change-Id: I8d8a84119ee36cb93be2f18cf2a03c576cf0ecd2
2020-10-06 21:47:07 +00:00
Treehugger Robot
4d96662b1f Merge "Expose getSmsCapacityOnIcc()" 2020-10-06 20:12:05 +00:00
Taesu Lee
a248f3586f Expose getSmsCapacityOnIcc()
Unhide getSmsCapacityOnIcc() and it requires READ_PHONE_STATE instead.

Bug: 154878196
Test: Manual

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Merged-in: I86ba39d5073227ff55251fabc614fd3b9347285e
Change-Id: I86ba39d5073227ff55251fabc614fd3b9347285e
2020-10-06 18:13:58 +00:00
Brad Ebinger
a7df4c0be6 Remove "one shot" type of FeatureCallback
Instead of having a special case for ImsManager#getInstance,
implement it properly.

Test: atest CtsTelephonyTestCases

Merged-In: I2e986fb2a1086043a25b11c71c005481cea74196
Change-Id: I2e986fb2a1086043a25b11c71c005481cea74196
2020-10-05 11:04:40 -07:00
Brad Ebinger
1e9cc7b2e5 Clean up IMS based interfaces to use a push model instead of poll
[RESUBMISSION AFTER REVERT aosp/1443078]

Instead of requiring that listeners poll for an ImsFeature binder
when they go down, modify interfaces to notify listeners when a
new instance of a Binder is available.

Test: atest CtsTelephonyTestCases FrameworksTelephonyTests ImsCommonTests
Test: manual E2E tests of IMS functionality (call, SMS, settings...)

Merged-In: I0bb48f82ecf7a1283be8fd441a787dff587d6d61
Change-Id: I0bb48f82ecf7a1283be8fd441a787dff587d6d61
2020-10-05 11:03:59 -07:00
Jack Yu
6466dd02d9 Merge "Added getEquivalentHomePlmns API" am: 6c541722ff am: ee052afb4f am: ed1d2560ff am: 73d3765e84
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1441700

Change-Id: Ief8a0aa10e5b587692711c2974375dc9b68d72b8
2020-10-01 20:08:40 +00:00
Jack Yu
6c541722ff Merge "Added getEquivalentHomePlmns API" 2020-10-01 18:29:31 +00:00
Brad Ebinger
bcbad4f650 Merge "Revert "Clean up IMS based interfaces to use a push model instea..."" am: 8827badd30 am: 9a8e4bf6f1 am: a6bc5361b7 am: 9123ff8c6e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1443078

Change-Id: Ia9d94fda9dc85ad0f07cd251dbdd1632b8946a4d
2020-09-30 22:33:22 +00:00
Radhika Agrawal
c2dd3604c9 Merge "Fix un-dismissable incoming call for auto-rejected calls" into rvc-qpr-dev am: 0c52a7600f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12721135

Change-Id: I5c4e739f8d5edde57f815ed2aa98f8868d2c8572
2020-09-30 21:54:43 +00:00
Brad Ebinger
8827badd30 Merge "Revert "Clean up IMS based interfaces to use a push model instea..."" 2020-09-30 21:00:35 +00:00
Brad Ebinger
360c5f1749 Fix un-dismissable incoming call for auto-rejected calls
When the device receives an incoming call indication and quickly
receives another call terminated indication (such as the auto
reject case), there is the possiblity that the call terminated indication
happens while onIncomingCall is still being processed. This is due to the
fact that binder oneway calls are only guaranteed to be on the same binder
thread for the same IBinder node. Since these callbacks are happening on
two separate nodes potentially, there are running in two binder threads
at the same time, causing race conditions.

Instead, the onIncomingCall binder call should not be oneway (as it is
required to complete before other indications should occur) and only
return control back to the ImsService thread once the
MmTelFeature#notifyIncomingCall call completes.

Bug: 160213239
Fixes: 169723915
Test: incoming call, auto-rejected incoming call on MSIm
Merged-In: I054e6b00656fc04f48f7f378076e29322daf59ad
Change-Id: I054e6b00656fc04f48f7f378076e29322daf59ad
2020-09-30 13:02:46 -07:00
Jack Yu
34a50e35f5 Added getEquivalentHomePlmns API
Added a new API to retrieve EF_EHPLMN from the SIM.

Fix: 155843989
Test: CtsTelephonyTestCases

Change-Id: I2797dc466e12f9aa64b830b93446ee1d0532c760
2020-09-30 12:16:19 -07:00
Brad Ebinger
bdd15379d2 Revert "Clean up IMS based interfaces to use a push model instea..."
Revert "Move IMS to a listener type model instead of a poll model"

Revert "Push Binder updates when ImsFeatures change"

Revert submission 1425374-ims_poll

Reason for revert: b/169729036, ANR in phone process
Reverted Changes:
I1d6dd2dfd:Move to a push model of querying ImsFeature Binder...
Ie3982c245:Move IMS to a listener type model instead of a pol...
I8b9ded0f4:Push Binder updates when ImsFeatures change
Ia9f7ae3db:Clean up IMS based interfaces to use a push model ...

Merged-In: I7ef3c07021a79e809d2c8b30ed2422372eae962d
Change-Id: I7ef3c07021a79e809d2c8b30ed2422372eae962d
2020-09-30 17:31:59 +00:00
Nathan Harold
32f7c492fc Merge "Deprecate CellLocation Classes" am: 27b3384102 am: b92bb8e643 am: 5d8e5249d6 am: febf87fde1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1429088

Change-Id: Ib97a5d6c10c47d7213c0a9a17ebcb0144079fdb5
2020-09-30 01:05:12 +00:00