Commit Graph

11221 Commits

Author SHA1 Message Date
TreeHugger Robot
8a43d3dcdd Merge "Remove iwlan mac config" into sc-dev am: e7f53e4de5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13628333

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic669006efd1430db0ceba3f7e476743cf33d13d3
2021-02-20 21:13:51 +00:00
TreeHugger Robot
e7f53e4de5 Merge "Remove iwlan mac config" into sc-dev 2021-02-20 20:39:07 +00:00
Jack Yu
19d0ffc3f8 Merge "Simplified the initial attach APN logic" into sc-dev am: 3bdcaf83f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13606137

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia27d87fcce17cc4367cbf45b7b1d7429bb9d314b
2021-02-20 10:01:12 +00:00
Jack Yu
3bdcaf83f0 Merge "Simplified the initial attach APN logic" into sc-dev 2021-02-20 09:55:49 +00:00
Brad Ebinger
c97c86cd32 Merge "Integrate ACCESS_IMS_SINGLE_REGISTRATION into APIS" into sc-dev am: 14c72817c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13606262

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib44881898ae7ec5de972c66b76b65535421a6dc2
2021-02-19 19:54:58 +00:00
Naina Nalluri
7d08c8e8c1 Remove iwlan mac config
Bug: 180627285
Test: Unit tests
adb shell cmd phone cc get-value [KEY] failed

Change-Id: I65ff023ba94c2af752490375f41fe845252eb8ad
2021-02-19 09:02:32 -08:00
Jack Yu
0bebba7378 Simplified the initial attach APN logic
1. Instead of using the hardcoded order, read the order
   from configuration. This also allows carriers to specify
   the allowed types of APN can be used for initial attach.
2. Removed the preferred APN logic. The preferred APN is
   specifically for the default APN after a successful data
   setup. It's not related to initial attach.

Fix: 169657628
Test: Manual
Change-Id: I9fbf4f270726cba1281770db88fec7c1bb62e6db
2021-02-18 07:22:58 +00:00
Yomna Nasser
0bb7281b4f Merge "Implementation of "Enable 2G" for Settings." into sc-dev am: a20761e23f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13533107

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03d5d5cc3ccbb78aec031e866b4976f1348439b1
2021-02-18 00:13:35 +00:00
Hall Liu
52b8c480fe Merge "Improve docs for uploadCallComposerPicture" into sc-dev am: f4f96c166b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13606646

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ed8ef58551886b5e991a3a294a8d7871e207e63
2021-02-18 00:13:14 +00:00
Brad Ebinger
63a1579abc 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
Change-Id: Ie0e1198c8b9cfa0bab90407c8d35273159f63302
2021-02-17 23:59:11 +00:00
Yomna Nasser
a20761e23f Merge "Implementation of "Enable 2G" for Settings." into sc-dev 2021-02-17 23:45:17 +00:00
Hall Liu
f4f96c166b Merge "Improve docs for uploadCallComposerPicture" into sc-dev 2021-02-17 23:44:26 +00:00
Hunter Knepshield
1f48fd9e57 Merge "Allow optional package names in carrier configs" am: 68612ac556 am: c47df2e2e9 am: 7c7bb0cb69 am: 2b2c3e6724
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563677

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a548e2ac97b820783a0d5839143df5b8d37eb27
2021-02-17 22:44:16 +00:00
Brad Ebinger
553ad8340f Merge "[RCS UCE] Expose the OPTIONS APIs to support OPTIONS mechanism" am: c7baa4862f am: cd59a1a0f3 am: abfa62f80b am: d9e4faebe8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574863

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b7382a29afe3bfbe0d2367fe3d075ee2eed3a04
2021-02-17 22:41:18 +00:00
Hunter Knepshield
2b2c3e6724 Merge "Allow optional package names in carrier configs" am: 68612ac556 am: c47df2e2e9 am: 7c7bb0cb69
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563677

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65c281e0e6064b7335b9ca7942de1480d0e998c5
2021-02-17 22:29:55 +00:00
Brad Ebinger
d9e4faebe8 Merge "[RCS UCE] Expose the OPTIONS APIs to support OPTIONS mechanism" am: c7baa4862f am: cd59a1a0f3 am: abfa62f80b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574863

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6780e5f6a10924f4b445fb100535961b3272166f
2021-02-17 22:28:02 +00:00
Hunter Knepshield
7c7bb0cb69 Merge "Allow optional package names in carrier configs" am: 68612ac556 am: c47df2e2e9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563677

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia937988ef040a85a028ec45d69fad3f291860904
2021-02-17 21:47:17 +00:00
Brad Ebinger
abfa62f80b Merge "[RCS UCE] Expose the OPTIONS APIs to support OPTIONS mechanism" am: c7baa4862f am: cd59a1a0f3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574863

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iddf0a66cee2204f7eeb50ea8ce6fe38f2a93b44b
2021-02-17 21:44:47 +00:00
Hunter Knepshield
68612ac556 Merge "Allow optional package names in carrier configs" 2021-02-17 20:58:27 +00:00
Hall Liu
a8af60de77 Improve docs for uploadCallComposerPicture
Add stuff about when this functionality is available and what image
formats are supported.

Fixes: 180419617
Test: docs onle
Change-Id: I541f32a4021deee6848408898186dcffeff81a89
2021-02-17 12:56:58 -08:00
Brad Ebinger
13def9b683 Merge "Move to ACCESS_RCS_USER_CAPABILITY_EXCHANGE for UCE APIs" into sc-dev am: 4597584e8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13592356

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I688d263ab7d6910b79f3945eb65178e5e66a4e54
2021-02-17 20:44:54 +00:00
Brad Ebinger
c7baa4862f Merge "[RCS UCE] Expose the OPTIONS APIs to support OPTIONS mechanism" 2021-02-17 20:27:18 +00:00
Yomna Nasser
8fa54b7c20 Implementation of "Enable 2G" for Settings.
(1) Adds KEY_HIDE_ENABLE_2G_BOOL to CarrierConfigManager, and
(2) Adds new reason ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G.

Test: manual & atest -c Enable2gPreferenceControllerTest
Bug: b/163168917
Change-Id: I81052549f8dde491697c35365320145fd24c3842
2021-02-17 19:38:33 +00:00
James.cf Lin
603c23178a [RCS UCE] Expose the OPTIONS APIs to support OPTIONS mechanism
Expose OPTIONS portion of capability exchange APIs.

Bug: 174166957
Test: atest CtsTelephonyTestCases
Change-Id: I21277fce055f31400f2018b6f81102225cb7c7c8
2021-02-17 18:17:35 +00:00
Brad Ebinger
2254a577da Move to ACCESS_RCS_USER_CAPABILITY_EXCHANGE for UCE APIs
Move from MODIFY_PHONE_STATE to ACCESS_RCS_USER_CAPABILITY_EXCHANGE
permission for associated APIs.

Bug: 174861641
Bug: 154764486
Test: atest CtsTelephonyTestCases
Change-Id: I978161a230ce23e17d3b16cc92c3e82ea1cbb407
2021-02-17 02:32:02 +00:00
Franck Perez
32bd3884fc Allow optional package names in carrier configs
Bug: 149749602
Test: tested locally both the non-regression (no package names) and the new behaviour (package names) with carrier-provided test apps
Change-Id: I0b807ea1f6ae1f1663dd4362900ab61012a0aa8d
2021-02-15 10:29:43 -05:00
TreeHugger Robot
f31c958342 Merge "[WifiCoex] Add carrier config flags for 5GHz Wifi/LAA coex" into sc-dev am: 7f11596f0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13428600

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1136a35ed8f0f60ade409ebe08e35722ff4e15bd
2021-02-15 00:26:39 +00:00
TreeHugger Robot
7f11596f0a Merge "[WifiCoex] Add carrier config flags for 5GHz Wifi/LAA coex" into sc-dev 2021-02-15 00:23:14 +00:00
Brad Ebinger
db3dd2d54b Merge "Add the ability to send the feature tags associated with IMS registration" am: dd170ee3f3 am: 79bba23280
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584226

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb09eacd1a2022d597510510195f4d6a67d76d95
2021-02-12 19:22:31 +00:00
Brad Ebinger
dd170ee3f3 Merge "Add the ability to send the feature tags associated with IMS registration" 2021-02-12 18:35:13 +00:00
Daniel Bright
2bd0f21f82 Merge "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev am: 560f4f6ed4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13511224

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05d6cdd9bf20e641901d00fb0fce0cb449cac16c
2021-02-12 05:28:32 +00:00
Daniel Bright
308f5080bd Merge "Changed ApnThrottleStatus to ThrottleStatus" am: 9379af7c56 am: ce0ac6794a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1581424

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb8ca010023526051a6a18a091002d189cd5254f
2021-02-12 00:43:29 +00:00
Daniel Bright
e177c09787 Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED
* Made the HAL version available to radio interface capabilities
* With version 1.6 of the Radio HAL, a new function was added to enforce
the user network types preference (setAllowedNetworkTypeBitmap).
Depending on the version implemented by the modem the
setPreferredNetworkType and setAllowedNetworkTypes TelephonyManager API
methods may use this new HAL method or rely on the previous method
(setPreferredNetworkType). This new capability enum value can be used by
TelephonyManager consumers to know which HAL function is effectively
backing up their calls.

Bug: 163168917
Test: checked logs, created RadioConfigCapabilitiesResponseTest
Change-Id: Ie31d32a08b10b8c125f27832e81a3e65b6d8767a
2021-02-11 15:35:54 -08:00
Daniel Bright
9379af7c56 Merge "Changed ApnThrottleStatus to ThrottleStatus" 2021-02-11 23:31:24 +00:00
Daniel Bright
a5a88fd3e8 Changed ApnThrottleStatus to ThrottleStatus
* Changed verbiage to be more generic at request of the API council

Bug: 175092152
Test: make & flash
Merged-In: I8bec64b0c38be94bcd3f3b99bcebfb378384c970
Change-Id: I8bec64b0c38be94bcd3f3b99bcebfb378384c970
2021-02-11 13:02:19 -08:00
Brad Ebinger
8420894edc Add the ability to send the feature tags associated with IMS registration
- In order to better support UCE, allow the IMS registration update to
the framework to include the feature tags associated with the registration
so that this information can be used in SIP PUBLISH.

- Encapsulate other IMS registration attributes into a singlular class.

Bug: 177375635
Test: atest CtsTelephonyTestCases:ImsServiceTest
Merged-In: Id730e5e0c9322c2a845523f3b3901f3d899c3f1c
Change-Id: Id730e5e0c9322c2a845523f3b3901f3d899c3f1c
2021-02-11 19:59:16 +00:00
SongFerng Wang
de3ce41f28 Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" into sc-dev 2021-02-11 08:28:21 +00:00
SongFerng Wang
3418adf62e Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" 2021-02-10 08:33:20 +00:00
Brad Ebinger
08c2d46beb Merge "Add the ability to send the feature tags associated with IMS registration" into sc-dev am: b7322dae52
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13459750

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6c8a72c6d2e71689ff7d800b1addfe26267295b
2021-02-10 02:09:53 +00:00
Brad Ebinger
b7322dae52 Merge "Add the ability to send the feature tags associated with IMS registration" into sc-dev 2021-02-10 02:01:51 +00:00
TreeHugger Robot
6cab7d5fed Merge "Update docs for getServiceState" into sc-dev am: faad7c721d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13535546

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b5f1c9f66277f0dae58350e80c2439e4a8ab7bc
2021-02-10 01:33:36 +00:00
TreeHugger Robot
faad7c721d Merge "Update docs for getServiceState" into sc-dev 2021-02-10 01:16:39 +00:00
Quang Luong
fb39c5de57 [WifiCoex] Add carrier config flags for 5GHz Wifi/LAA coex
Add carrier config flags to enable coex avoidance of 5GHz Wifi channels
if LAA is active.

Bug: 153651001
Test: build
Change-Id: I83b2182a7ee22462fca49ac559ab2418d55b9b3f
2021-02-09 17:00:23 -08:00
Brad Ebinger
1ef592d1c8 Merge "[RCS UCE] Expose the IMS RCS feature APIs" am: a7f8e8fe6e am: d4a311a5b9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562892

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id772eaf136b0ed8dbca801771055b4485bb22c89
2021-02-09 22:51:10 +00:00
Brad Ebinger
a7f8e8fe6e Merge "[RCS UCE] Expose the IMS RCS feature APIs" 2021-02-09 22:21:09 +00:00
Michele Berionne
4e363ab909 Merge changes from topic "sc_sim-pin-after-ota" into sc-dev am: 17373ec548
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13431815

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5c8e2ca55dd96cb8320bcdb3d64962682c57dc49
2021-02-09 22:16:46 +00:00
Hall Liu
92b0e4b084 Update docs for getServiceState
Update docs for getServiceState to reflect the degrading behavior
depending on the location permissions the caller holds, and to make it
clear that an appops usage will be logged against the caller if they
hold location permissions.

Fixes: 179390723
Test: NA
Change-Id: Icd541ab9bd265eec9065041486574953f9bee0b1
2021-02-09 13:58:59 -08:00
SongFerngWang
c18545e14a Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo
NetworkTypeController set OVERRIDE_NETWORK_TYPE_NR_ADVANCED when
device connect NR and frequency is mmWave.

Bug: 179443240
Bug: 179453836
Test: atest frameworks/opt/telephony/src/java/com/android/internal/telephony/NetworkTypeController.java
Change-Id: I242e8499a1bb31dcb5a3f0fbae2f8423c8c8f8a0
Merged-In: I242e8499a1bb31dcb5a3f0fbae2f8423c8c8f8a0
2021-02-10 05:48:53 +08:00
SongFerngWang
1f8e5f0f81 Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo
NetworkTypeController set OVERRIDE_NETWORK_TYPE_NR_ADVANCED when
device connect NR and frequency is mmWave.

Bug: 179443240
Bug: 179453836
Test: atest frameworks/opt/telephony/src/java/com/android/internal/telephony/NetworkTypeController.java
Change-Id: I242e8499a1bb31dcb5a3f0fbae2f8423c8c8f8a0
2021-02-10 05:45:30 +08:00
Michele Berionne
17373ec548 Merge changes from topic "sc_sim-pin-after-ota" into sc-dev
* changes:
  Add new API for unattended reboot.
  Hide keyguard when SIM transitions to READY
2021-02-09 21:29:57 +00:00