Commit Graph

10459 Commits

Author SHA1 Message Date
Treehugger Robot
8de105cc8b Merge "Removed EpsQosSessionAttributes#onCreate" am: 5967b657ef am: 0dd1a463f0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626282

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5324674f92f5229affc6af4735da73826c6572bc
2021-03-12 00:05:08 +00:00
Treehugger Robot
5967b657ef Merge "Removed EpsQosSessionAttributes#onCreate" 2021-03-11 22:37:36 +00:00
Daniel Bright
27a0642a9b Merge "Update comments on onApnUnthrottled" am: 1bec754c8b am: bb58b8a819
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626323

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iafbd99a78e3cf47d5a265a88978e2a1a9e25cb70
2021-03-11 19:07:29 +00:00
Daniel Bright
1bec754c8b Merge "Update comments on onApnUnthrottled" 2021-03-11 18:02:36 +00:00
James Lin
77a4cfb81a Merge "Update the RCS UCE APIs." am: 6c165b2da9 am: 98eb9af014
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620862

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I87c782e01b8f283a21da330fa9e81e1cfc62c34b
2021-03-11 07:31:49 +00:00
James Lin
6c165b2da9 Merge "Update the RCS UCE APIs." 2021-03-11 06:28:00 +00:00
Sooraj Sasindran
b679d8bbcd Merge "Update documentation according API review" am: 2f85c69c74 am: 2cb338dbc0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619810

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a0aa4be487da19ef08f07f2613a15addacd2cdd
2021-03-11 02:18:50 +00:00
Daniel Bright
58100f4d4c Removed EpsQosSessionAttributes#onCreate
* The method EpsQosSessionAttributes#onCreate was not being used

Bug: 181562173
Test: m
Change-Id: I4321961f41c18f0abe6c5e837fe3c4a41beb63b7
2021-03-10 11:39:59 -08:00
Daniel Bright
6401192d92 Update comments on onApnUnthrottled
Bug: 175092152
Test: N/A
Change-Id: Ibe4ca4d9881f933affee4b138b980ca49deff15d
2021-03-10 11:02:23 -08:00
Sooraj Sasindran
60310d719e Update documentation according API review
Bug: 174580495, 174580077
Change-Id: I2791eb1351057a55caa99e9e1b95d26a31d708f2
Test: build
2021-03-10 15:15:19 +00:00
Zoey Chen
a22d9d466d [PhoneStateListener] Redesign PhoneStateListener: Use TelephonyCallback am: 4fff45499f am: a4a9372351
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614979

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ice7b09b8bb7456015e4508732b88dcf729fe1049
2021-03-09 11:51:04 +00:00
Zoey Chen
a4a9372351 [PhoneStateListener] Redesign PhoneStateListener: Use TelephonyCallback am: 4fff45499f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614979

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4aeb97cc5964a09178be43511c45910442a096b9
2021-03-09 11:21:50 +00:00
Zoey Chen
456069019e Merge changes from topic "PSL_TelephonyCallback"
* changes:
  [Telephony] Use TelephonyCallback instead of PhoneStateListener part1
  [PhoneStateListener] Redesign PhoneStateListener: Use TelephonyCallback
2021-03-09 10:36:03 +00:00
Zoey Chen
8a7ec68660 Merge "[Telephony] Fix the unknown value of ARFCN from -1 to INT.MAX" am: 761614c85f am: 7d90db3c30
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618841

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie5ea2c7ab65cbab16b0a117537e4c7b505458344
2021-03-09 08:07:41 +00:00
Zoey Chen
761614c85f Merge "[Telephony] Fix the unknown value of ARFCN from -1 to INT.MAX" 2021-03-09 07:06:06 +00:00
Hui Wang
c4cac7bb2d Merge "Update Provisioning API name and doc per API review" am: 629a24b258 am: f622e0e38e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562933

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91fbcc91ae746b4008c5028a4ce40d65236300cd
2021-03-08 22:59:09 +00:00
Hui Wang
629a24b258 Merge "Update Provisioning API name and doc per API review" 2021-03-08 22:02:20 +00:00
Zoey Chen
4fff45499f [PhoneStateListener] Redesign PhoneStateListener: Use TelephonyCallback
To avoid the IDE does not have the warn if developers implement callback:

1. Revert PhoneStateListener to Android 11 version.
2. New TelephonyCallback
3. Deprecate the old PhoneStateListener.onXx() callbacks

Bug: 167684594
Test: make and PhoneStateListenerTest and TelephonyCallbackTest
Change-Id: I0fdd7fc3c3d67310197862c84d02f30164ec80d1
Merged-In: I0fdd7fc3c3d67310197862c84d02f30164ec80d1
2021-03-08 15:11:32 +08:00
James.cf Lin
b476f89104 Update the RCS UCE APIs.
Add the RCS APIs and keep the original APIs.
The original APIs will be removed when the applications call the new APIs.
1) document the ImsException on the API requestAvailability
2) Use Collection instead of List for the contacts
3) Use Instant object to represent the timestamp information

Bug: 180126217
Test: atest ImsServiceTest RcsUceAdapterTest
Merged-In: I56a54cd07e8f785d7db8094b9b8a0191d6e28282
Change-Id: I56a54cd07e8f785d7db8094b9b8a0191d6e28282
2021-03-08 11:14:25 +08:00
Daniel Bright
a57b0042fe Merge "Hide start and cancel handover from api surface" am: ee4668c5a5 am: 42b6ecf0fc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598495

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a4de2f0aae42da567e997982cc655759f88d0f1
2021-03-06 00:38:56 +00:00
Daniel Bright
e69ec553b4 Hide start and cancel handover from api surface
* Since AOSP is in control of when IWlan allocates and releases the
  pdu session id, it doesn't need to react to start handover and
  cancel handover.
* CellularDataService can still use these methods since it is in
  AOSP.

Bug: 177607048
Test: make
Merged-In: I9e65ad178a843e92a59e5e4f7debd4d7b77a3edb
Change-Id: I9e65ad178a843e92a59e5e4f7debd4d7b77a3edb
2021-03-05 13:41:17 -08:00
SongFerng Wang
03297aacc6 Merge "Improve AllowedNetworkTypesForReason and refactor PreferredNetworkType" am: b332627a15 am: 6035378f91
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614985

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia227678f0f38adc05bf6ea39eee0eea8ebfea582
2021-03-05 05:17:43 +00:00
Brad Ebinger
9a0a35f947 Merge "Parse params needed for SipDelegate routing" am: 9a13fb1dbf am: b81ca0dc24
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1616689

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6cb191134894a3b6130dccc7f4b7d3fbcd85c5e3
2021-03-05 05:12:44 +00:00
Brad Ebinger
77e564bfba Merge "Define new permission to perform IMS RCS Reg actions and integrate ACCESS_IMS_SINGLE_REGISTRATION into APIS" am: ca282c8cbf am: a0f85ebf75
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596514

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11af5489b456fd6e84586c5f3ae8ee8da0aede11
2021-03-05 05:11:15 +00:00
Hui Wang
944ad68449 Update Provisioning API name and doc per API review
Bug: 178456092
Test: atest TeleServiceTests:com.android.phone.RcsProvisioningMonitorTest
Test: atest CtsTelephonyTestCases:android.telephony.ims.cts.ImsServiceTest
Change-Id: I2a5c6c9a760479361ce66401f87316dd3c9d909d
2021-03-05 03:16:39 +00:00
SongFerng Wang
b332627a15 Merge "Improve AllowedNetworkTypesForReason and refactor PreferredNetworkType" 2021-03-05 01:59:53 +00:00
Brad Ebinger
9a13fb1dbf Merge "Parse params needed for SipDelegate routing" 2021-03-05 01:11:02 +00:00
Brad Ebinger
ca282c8cbf Merge "Define new permission to perform IMS RCS Reg actions and integrate ACCESS_IMS_SINGLE_REGISTRATION into APIS" 2021-03-04 23:17:13 +00:00
Zoey Chen
0aed75aa77 [Telephony] Fix the unknown value of ARFCN from -1 to INT.MAX
Bug: 181792548
Test: atest CellIdentityTest, atest CtsTelephonyTestCases:android.telephony.cts.PhysicalChannelConfigTest
Change-Id: Idb22afc743e81d2fe38f0be683aeb7ca3398aa50
2021-03-04 16:47:59 +08:00
SongFerngWang
e206456a16 Improve AllowedNetworkTypesForReason and refactor PreferredNetworkType
- Add more reasons of allowed network type
  - ALLOWED_NETWORK_TYPES_REASON_USER
  - ALLOWED_NETWORK_TYPES_REASON_CARRIER
- Add @systemApi for below
  - ALLOWED_NETWORK_TYPES_REASON_USER
  - ALLOWED_NETWORK_TYPES_REASON_POWER
  - ALLOWED_NETWORK_TYPES_REASON_CARRIER
  - setAllowedNetworkTypesForReason API
  - getAllowedNetworkTypesForReason API
  - getAllowedNetworkTypesBitmask API
- Add Public for below
  - CARRIER_NR_AVAILABILITY_NONE
  - CARRIER_NR_AVAILABILITY_NSA
  - CARRIER_NR_AVAILABILITY_SA
  - KEY_CARRIER_NR_AVAILABILITY_INT
- @Deprecated API
  - setPreferredNetworkTypeBitmask
  - getPreferredNetworkTypeBitmask
  - setAllowedNetworkType
  - getAllowedNetworkType
- Add a new way to notify allowedNetworkType at PhoneStateListener
- Replace KEY_NR_ENABLED_BOOL with KEY_CARRIER_NR_AVAILABILITY_INT

Bug: 161434786
Test: atest TelephonyManagerTest#testSetAllowedNetworkTypesForReason
(PASS)
atest TelephonyManagerTest#\
testSetAllowedNetworkTypesForReason_moreReason
(PASS)
atest PhoneStateListenerTest#\
testOnAllowedNetworkTypesChangedByRegisterPhoneStateListener
(PASS)

Change-Id: I3d0c119a0c2a30c56b0c127ba6525f8992b4e9dd
Merged-In: I3d0c119a0c2a30c56b0c127ba6525f8992b4e9dd
2021-03-04 14:58:54 +08:00
Brad Ebinger
3215beb9e0 Parse params needed for SipDelegate routing
Add getViaBranchParameter and getCallId parameter to SipMessage
API in order to allow the SipDelegate to quickly route SipMessages
without requiring the app to peak into the headers.

Bug: 181591815
Test: atest CtsTelephonyTestCases
Change-Id: Iac94f73335ac5caa634b31c10a675aaf91c13af7
2021-03-04 02:06:28 +00:00
Sarah Chin
770d3084d9 Merge "APIs for 5G slicing" am: 08b9f41364 am: f898afeaf8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593931

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1232091caedbe49009667c5f34af543bb5c5be07
2021-03-03 19:29:48 +00:00
Brad Ebinger
e6d119c2e1 Merge "Move illegal state detection in stub classes to warning" am: 4d183b882d am: 98e4437b38
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613919

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I08cda211285f6309569d4ab1b818e3e9d2a3236a
2021-03-03 19:05:00 +00:00
Sarah Chin
08b9f41364 Merge "APIs for 5G slicing" 2021-03-03 18:42:20 +00:00
Sarah Chin
e97855c10f APIs for 5G slicing
Create TrafficDescriptor class
Create new APN ENTERPRISE
Update setupDataCall and DataCallResponse to take TrafficDescriptor and
matchAllRuleAllowed
Move ApnTypes from Annotation to ApnSetting

Bug: 179312227
Test: atest FrameworksTelephonyTests
Change-Id: I7433976bfe25bcb2af85ffb9338959cbcc9f42f3
Merged-In: I7433976bfe25bcb2af85ffb9338959cbcc9f42f3
2021-03-03 14:16:21 +09:00
Brad Ebinger
ded80f3e33 Move illegal state detection in stub classes to warning
In order to increase stability, move *ImplBase listeners to warning for
now until we can find the source of the error.

Fixes: 179217608
Test: manual; kill phone process
Merged-In: If1813ed6c82b778018d61691018604b6891ff34e
Change-Id: If1813ed6c82b778018d61691018604b6891ff34e
2021-03-03 00:59:27 +00:00
Hall Liu
e364276b90 Merge "Expose ApnSetting#TYPE_*_STRING constants" am: bff8389872 am: 04e788bebd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1610923

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I519807c3b0ac093ffa6fec23cc07b48fb9ef1d36
2021-03-02 23:54:22 +00:00
Hall Liu
4a264df43b Merge "Expose the carrier signaling broadcasts" am: b8cc532986 am: 05bc834ddc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613539

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If0dac083de7bd88455e5090d85b3761b1952aa0c
2021-03-02 23:52:41 +00:00
Treehugger Robot
18a1ef423e Merge "Add QoS filter matching and unit tests" am: 1e8b0527b5 am: 8625aaea0f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1610961

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d25d91a30ba9d0b38f2c77ea175a765b6a14eee
2021-03-02 23:52:11 +00:00
Hall Liu
bff8389872 Merge "Expose ApnSetting#TYPE_*_STRING constants" 2021-03-02 23:20:15 +00:00
Hall Liu
b8cc532986 Merge "Expose the carrier signaling broadcasts" 2021-03-02 22:54:18 +00:00
Hall Liu
39087a439e Expose the carrier signaling broadcasts
Expose broadcasts for communicating certain changes in state between
Telephony and carrier apps.

Implement a backward-compatibility layer to support carrier apps
targeting <=R that are listening to the old hidden broadcasts.

Fixes: 173050428
Test: atest CarrierSignalTest CarrierSignalAgentTest
Change-Id: I15d032ee1e31d9be847c2f084161f8555c8172c1
Merged-In: I15d032ee1e31d9be847c2f084161f8555c8172c1
2021-03-02 13:38:53 -08:00
Jayachandran C
82984a8ca1 Add QoS filter matching and unit tests
Bug: 158315614
Test: atest com.android.internal.telephony.dataconnection.QosCallbackTrackerTest

Merged-In: I7d6d66eba5612182703826b60b4d735230572eea
Change-Id: I7d6d66eba5612182703826b60b4d735230572eea
2021-03-02 13:31:26 -08:00
Hui Wang
7f0e4d9f78 Merge "Notify rcs config as needed when RCS service ready" am: a340c35a86 am: 18fb42d639
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612066

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7ec6a9aaf0fae912be8819fb2e0b522a127ca18
2021-03-02 21:30:58 +00:00
Hall Liu
dee1a5ad8c Expose ApnSetting#TYPE_*_STRING constants
Expose these string representations of APN types as SystemApi, and add
utility methods to convert between these and their integer equivalents.

Fixes: 173133122
Test: atest ApnSettingTest TelephonyRegistryTest
Change-Id: I8095ebc4f766be52042eec1c8ee043bf2e2dabfb
Merged-In: I8095ebc4f766be52042eec1c8ee043bf2e2dabfb
2021-03-02 13:25:47 -08:00
Chiachang Wang
ed5da75243 Merge "Revert "Expose NetworkRegistrationInfo.getNrState() as public API"" am: 237d2d47a4 am: cc717d3cf9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607735

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68e07cb3f7d369073d4b05433e1c746bc9277095
2021-03-02 19:52:30 +00:00
Hui Wang
a340c35a86 Merge "Notify rcs config as needed when RCS service ready" 2021-03-02 19:20:38 +00:00
Chiachang Wang
237d2d47a4 Merge "Revert "Expose NetworkRegistrationInfo.getNrState() as public API"" 2021-03-02 06:31:26 +00:00
Brad Ebinger
29dfa1cd76 Define new permission to perform IMS RCS Reg actions and integrate ACCESS_IMS_SINGLE_REGISTRATION into APIS
Move from MODIFY_PHONE_STATE to ACCESS_IMS_SINGLE_REGISTRATION
as per design doc.

Bug: 149426399
Bug: 173652571
Bug: 168923956
Test: atest CtsTelephonyTestCases
Merged-In: I6d4ae879d9d2b347f6576ea20f9e42454b39936b
Merged-In: Idabfda6853ec2a24544da5253ad0e43c47a6cc69
Change-Id: Ie0e1198c8b9cfa0bab90407c8d35273159f63302
2021-03-02 11:39:02 +08:00
Hui Wang
e4fb450fe0 Notify rcs config as needed when RCS service ready
Bug: 180503768
Test: atest TeleServiceTests:com.android.phone.RcsProvisioningMonitorTest
Merged-In: I859a9b6bd439cca01aeed8448f684e17cb80d397
Change-Id: I859a9b6bd439cca01aeed8448f684e17cb80d397
2021-03-01 22:51:42 +00:00