This is a preparatory work for mainline. since Intdef is hidden, so we
have to move some annotations (applied in SDK/system API) to a separate
annotation class and having other module statically link to it.
TODO: include telephony annotation in framework-non-updatable-sources
Bug: 140908357
Test: Build
Change-Id: I37f8a0624bbf27f264870ee9dbf03d3aaa5cadc1
(cherry picked from commit c9d4ee112e)
Merged-in: I37f8a0624bbf27f264870ee9dbf03d3aaa5cadc1
(cherry picked from commit 4712711d3d91621083bf92f5a1647b92c20a8b81)
Reverted to the old logic that we select APN based on
RAT, but adding a special handling for 2G cases. This can
deal with the case that some APN settings has EHRPD which
we incorrectly thought that APN setting can be used on CDMA
network.
Bug: 134086103
Test: Unit tests
Change-Id: I557f00d32f53498782394ea7824e316e263ca7e7
attached.
Before setting up data connection, we check if it's on non-dds and
voice is registered on non-LTE network, if true we'll setup the data
connection even if it's not attached.
Bug: 134086103
Test: manual
Change-Id: I43e150c1d0cc4065da07f4a5ec738b967e7a9a6d
Merged-In: I43e150c1d0cc4065da07f4a5ec738b967e7a9a6d
The existing logic for merging service state when device is on
IWLAN does not work properly on AP-assisted mode devices. Fixed
by copying the IWLAN preferred flag into IMS service state so
it can get the correct data RAT for AP-assisted mode devices.
Bug: 134706530
Test: WFC manual tests
Merged-In: Ic18934adb870a0114c913855cdb68e0ef33caa79
Change-Id: Ic18934adb870a0114c913855cdb68e0ef33caa79
(cherry picked from commit 5e640ac80e)
attached.
Before setting up data connection, we check if it's on non-dds and
voice is registered on non-LTE network, if true we'll setup the data
connection even if it's not attached.
Bug: 134086103
Test: manual
Change-Id: I43e150c1d0cc4065da07f4a5ec738b967e7a9a6d
Correctly supported the legacy data RAT when both cellular
and IWLAN are in service. In this case only report
RAT as IWLAN when any type of APN is preferred on IWLAN.
Otherwise still use the RAT reported by cellular network
service.
Bug: 133516945
Test: Manual
Merged-In: Ifdddad1d5ee95f4576d5002a1b66caafc172cb58
Change-Id: Ifdddad1d5ee95f4576d5002a1b66caafc172cb58
(cherry picked from commit a74f2d8c34)
Correctly supported the legacy data RAT when both cellular
and IWLAN are in service. In this case only report
RAT as IWLAN when any type of APN is preferred on IWLAN.
Otherwise still use the RAT reported by cellular network
service.
Bug: 133516945
Test: Manual
Change-Id: Ifdddad1d5ee95f4576d5002a1b66caafc172cb58
Fixed by adding synchronization block for every place
accessing network registration info in service state.
Bug: 131883293
Test: Manual
Merged-In: Ic10931b7fab998bfebe09d316a2d87886222dae3
Change-Id: Ic10931b7fab998bfebe09d316a2d87886222dae3
(cherry picked from commit 4c11809764)
Fixed by adding synchronization block for every place
accessing network registration info in service state.
Bug: 131883293
Test: Manual
Change-Id: Ic10931b7fab998bfebe09d316a2d87886222dae3
This add the 5GE icon to the system UI for specific carriers
LTE CA network.
Bug: 124768697
Test: build & manually test:
fake the operator name with pattern, and check the status bar data icon.
Change-Id: Ife0401219138c7ed22e7bfbd4d5e8648c54a98a8
Merged-In: Ife0401219138c7ed22e7bfbd4d5e8648c54a98a8
NetworkRegistrationInfo and ServiceState are not
immutable class. Their get methods should return a new
copy of object so the caller won't modify its state.
Bug: 130538118
Test: Unit tests + manual
Merged-In: I51662a92b0b6189a8c8aa017085affedac417190
Change-Id: I51662a92b0b6189a8c8aa017085affedac417190
(cherry picked from commit 37538594e6)
NetworkRegistrationInfo and ServiceState are not
immutable class. Their get methods should return a new
copy of object so the caller won't modify its state.
Bug: 130538118
Test: Unit tests + manual
Change-Id: I51662a92b0b6189a8c8aa017085affedac417190
This add the 5GE icon to the system UI for specific carriers
LTE CA network.
Bug: 124768697
Test: build & manually test:
fake the operator name with pattern, and check the status bar data icon.
Change-Id: Ife0401219138c7ed22e7bfbd4d5e8648c54a98a8
Merged-In: Ife0401219138c7ed22e7bfbd4d5e8648c54a98a8
(cherry picked from commit 2d178eaabb)
ServiceState.setStateOutOfService does not correctly
clean up the information so the old WLAN registration info
got populated for the next time use.
Bug: 130048577
Test: Telephony sanity tests
Merged-In: I7fab7090c22390914af024c44bffd643c13f33e5
Change-Id: I7fab7090c22390914af024c44bffd643c13f33e5
(cherry picked from commit 9302618da6)
ServiceState.setStateOutOfService does not correctly
clean up the information so the old WLAN registration info
got populated for the next time use.
Bug: 130048577
Test: Telephony sanity tests
Change-Id: I7fab7090c22390914af024c44bffd643c13f33e5
The voice and data RAT are now derived from
CS and PS network registration info.
Test: Manual + unit tests
Bug: 129863444
Merged-In: I3f4cb6057a4ae821363099583eeac7c867147afb
Change-Id: I3f4cb6057a4ae821363099583eeac7c867147afb
(cherry picked from commit 5ff5ab5649)
The voice and data RAT are now derived from
CS and PS network registration info.
Test: Manual + unit tests
Bug: 129863444
Change-Id: I3f4cb6057a4ae821363099583eeac7c867147afb
Renamed DataSpecificRegistrationState to
DataSpecificRegistrationInfo. And added some
APIs to test API so they can be accessed by
CTS.
Test: Manual
Bug: 127657991
Merged-In: I1a623c18f02cfd19ca1af9df912d859b363f42d1
Change-Id: I1a623c18f02cfd19ca1af9df912d859b363f42d1
(cherry picked from commit dba103204c)
Renamed DataSpecificRegistrationState to
DataSpecificRegistrationInfo. And added some
APIs to test API so they can be accessed by
CTS.
Test: Manual
Bug: 127657991
Change-Id: I1a623c18f02cfd19ca1af9df912d859b363f42d1
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 806b64228d)
Made several API changes per API council
suggestions.
Test: Manual + unit tests
Bug: 127812471
Bug: 128607082
Change-Id: I0f93c07207b10b566e9f858361e55b18dc0881a0
Made the follwing changes based on API council review
feedback
1. Made the class and its Builder class final
2. Removed methods that should not be in the builder
3. Changed the return type of available services
from array to list.
Test: Unit tests
Bug 127657991
Merged-In: I3c2d406fed3ddaf62dee193c7657caf8c5bc13d2
Change-Id: I3c2d406fed3ddaf62dee193c7657caf8c5bc13d2
(cherry picked from commit 20d71403b8)
CTS testing for ServiceState's getRoaming() requires using
setDataRoamingType() and setVoiceRoamingType() for preparing state.
These are currently annotated as @hide and @UnsupportedAppUsage, with a
maxTargetSdk of P.
Bug: 74207290
Test: atest CtsTelephonyTestCases:ServiceStateTest
Change-Id: I08efeeae81494c0431ce34c5d68a73d4824c8d1d
Made the follwing changes based on API council review
feedback
1. Made the class and its Builder class final
2. Removed methods that should not be in the builder
3. Changed the return type of available services
from array to list.
Test: Unit tests
Bug 127657991
Change-Id: I3c2d406fed3ddaf62dee193c7657caf8c5bc13d2
ServiceState implements Parcelable and all 'Parcelables' are required to
be final, per the Android API Guidelines (go/android-api-guidelines).
This won't be changed for historical reasons, but clients should avoid
extending this class.
Bug: 128865231
Test: non-functional change that won't impact tests.
atest CtsTelephonyTestCases:ServiceStateTest
Change-Id: Ib369f1449a3e085f404fff1c706fda0b76d42890
API review changes. The class covers more information other than
registration state.
Test: Build
Bug: 127657991
Merged-In: I8af36b388182ab08257b64c37078f156d4821709
Change-Id: I8af36b388182ab08257b64c37078f156d4821709
(cherry picked from commit e27d3fde88)
API review changes. The class covers more information other than
registration state.
Test: Build
Bug: 127657991
Change-Id: I8af36b388182ab08257b64c37078f156d4821709
ServiceState currently overrides hashCode() incorrectly. It hashes an
Array field without using Arrays.hashCode(), meaning that the default
Object.hashCode() implementation is used (which is based on the address
of the Array field). This allows equivalent ServiceState instances to
produce different hashes.
Bug: 128609620
Test: atest CtsTelephonyTestCases:ServiceStateTest
Change-Id: I40a7d0b7ebab6d2a1be47ea63a6d223c4c13700b
Moved out from the sub class per API review feedback.
Test: Build
Bug: 128607082
Merged-In: I1b513bcaaa0ebf47c14593d962579ed48a7c6db0
Change-Id: I1b513bcaaa0ebf47c14593d962579ed48a7c6db0
Fixed APIs that not meeting API review requirement.
1. Changed createXxxServiceProvider to onCreateXxxServiceProvider
2. Added builder for NetworkRegistrationState
Test: Manual
Bug: 126552434
Change-Id: Idb2411a47caf61e83fe26b98e393fa851ac1759d
