Commit Graph

7473 Commits

Author SHA1 Message Date
Allen Su
6489e5328f Merge "[RCS] Add triggerType for onNotifyUpdateCapabilites" 2020-01-16 02:45:40 +00:00
Mingming Cai
3149662515 Merge "Migrate convertHalCellIdentityToCellIdentity()" 2020-01-16 02:10:57 +00:00
Sarah Chin
f1de6ef70b Merge "Remove @hide for CarrierConfigManager constants" 2020-01-15 21:40:35 +00:00
Treehugger Robot
aa7d4c540d Merge "Add javadoc @see to methods affected by resetAllCarrierActions" 2020-01-15 21:15:13 +00:00
Mingming Cai
81e1da28a5 Migrate convertHalCellIdentityToCellIdentity()
Remove convertHalCellIdentityToCellIdentity() in
CellularNetworkService, and introduce create() in CellIdentity
for CellIdentity 1.0 and 1.2.

Bug: 146498725
Test: atest CellularNetworkServiceTest
Change-Id: Ibf07f770b377c383ea0c4d3ef2d1d991a37854a9
Merged-In: Ibf07f770b377c383ea0c4d3ef2d1d991a37854a9
(cherry picked from commit f55983a5d5)
2020-01-15 12:31:30 -08:00
Hall Liu
38fa60b511 Merge "Expose ServiceState#getDataNetworkType as SystemApi" 2020-01-15 19:09:19 +00:00
Shuo Qian
725c54065d Merge "Cleanup ITelephony in TelephonyPermissions with new System API. This method is used by Telephony Module for permission checking." 2020-01-15 18:51:54 +00:00
Treehugger Robot
c764cb634d Merge "Use new UnsupportedAppUsage annotation." 2020-01-15 13:29:02 +00:00
allenwtsu
02dc982642 [RCS] Add triggerType for onNotifyUpdateCapabilites
Bug:147122370
Test: build pass
Change-Id: I161de7bb6c27b06102a6754771e2693ae3ee4886
2020-01-15 19:39:09 +08:00
Zongheng Wang
d48914249d Merge "Created an API to get encoded message of SubmitPuds" 2020-01-15 03:05:14 +00:00
sqian
1e28948aaa Cleanup ITelephony in TelephonyPermissions with new System API.
This method is used by Telephony Module for permission checking.

Test: manual; cts; unit tests in other CLs
Bug: 145688189
Change-Id: Ie706e05e6a69e570331c1fe08a8df9677e0d9c8a
Merged-In: Ie706e05e6a69e570331c1fe08a8df9677e0d9c8a
Merged-In: If3adcd17916be2e81497061120d1f350bfb8026d
(cherry picked from commit 145294168f)
2020-01-15 02:53:32 +00:00
Allen Su
b498fbf860 Merge "[RCS] Implement notifyRcsAutoConfigurationReceived()" 2020-01-15 02:42:27 +00:00
Michele
fc81eab13a Add javadoc @see to methods affected by resetAllCarrierActions
Bug: 143548877
Test: make
Change-Id: I3792bff727d87d30ea90db202b594df3d16a8afb
2020-01-14 16:52:46 -08:00
Sarah Chin
a42e241438 Remove @hide for CarrierConfigManager constants
Remove @hide for CarrierConfigManager constants used outside of
Telephony mainline

referencing packages:
cts/tests
frameworks/base/packages/CarrierDefaultApp
frameworks/base/packages/SystemUI
frameworks/base/packages/Tethering
frameworks/base/services
frameworks/base/telecomm
frameworks/opt/wifi
packages/apps/Dialer
packages/apps/Settings
packages/providers/BlockedNumberProvider
packages/services/Car
packages/services/Telecomm
prebuilts/sdk

Test: build
Bug: 147447171
Change-Id: Ib3d8d904a80f11247012b01aceb92eaee2c84d5b
Merged-In: Ib3d8d904a80f11247012b01aceb92eaee2c84d5b
2020-01-14 15:56:39 -08:00
Jack Yu
8027ca9b97 Merge changes from topic "remove_dev_mode"
* changes:
  Do not migrate use full volume shared preference
  support data migration from OEM legacy app to mainline
2020-01-14 22:59:31 +00:00
Jack Yu
c3133cbc57 Do not migrate use full volume shared preference
Use full volume has been renamed to override DnD and
the toggle is now only available for certain countries. We
intended not to provide the ability to migrate this shared
preference as it might cause issue for users who already
changed the preference. After mainline migration, override
DnD should be always reset to default value of that country.

Test: Manual
Bug: 147426188

Merged-In: I5746fe32674131b474e784bd5dd62ecff76386d5
Change-Id: I5746fe32674131b474e784bd5dd62ecff76386d5
(cherry picked from commit bcbe46816c)
2020-01-14 22:59:05 +00:00
Hall Liu
5884933ee6 Expose ServiceState#getDataNetworkType as SystemApi
Test: atest android.telephony.cts.ServiceStateTest#testGetDataNetworkType
Bug: 146834818
Change-Id: If3f7b227da1bd2d3a107375dbd8b4218435dc1dc
2020-01-14 14:28:57 -08:00
Meng Wang
52cc4a4321 Merge changes Iec082f0c,I86a479af
* changes:
  telephony/common/* should use android.util.Log
  Use com.android.telephony.Rlog for mainline module.
2020-01-14 18:06:22 +00:00
Brad Ebinger
6408fa473f Merge "Add new @SystemApis for RCS dependencies" 2020-01-14 17:31:36 +00:00
Artur Satayev
53ada2ab28 Use new UnsupportedAppUsage annotation.
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv \
      git diff HEAD^ HEAD | grep '^[+-][^+-]' | grep -v '.import'
Merged-In: I853372f3c6fef905553bb31be4f1bb48df735f7a
Change-Id: I853372f3c6fef905553bb31be4f1bb48df735f7a
2020-01-14 15:54:55 +00:00
allenwtsu
f7ce51f9cf [RCS] Implement notifyRcsAutoConfigurationReceived()
Bug: 147122370
Test: build pass
Change-Id: I239c53806b148e899d8078c469731f05e8b97885
2020-01-14 14:30:01 +08:00
Betty Chang
9f48bdc383 Merge "[Telephony Mainline] Add new SystemApi method and SystemApi annotation for mainline" 2020-01-14 06:19:49 +00:00
Zongheng Wang
af0c40bc76 Created an API to get encoded message of SubmitPuds
* Created a BT-speciic API which wrapped up BT usage of Telephony
  internal APIs.

Bug: 140562205
Test: Manual
Change-Id: I03f71fb94676e7e33e98cad2f5e05960f274a14a
Merged-In: I1a26bd306812a5f8489978cc6ac30770dcf3f0f1
2020-01-14 13:07:00 +08:00
Allen Su
b1c730d069 Merge "[RCS] Add set/getRcsProvisioningStatusForCapability()" 2020-01-13 23:15:14 +00:00
Treehugger Robot
cc2956a0bd Merge "Expose sanitizeLocationInfo as SystemApi" 2020-01-13 22:45:44 +00:00
Brad Ebinger
10327316a9 Add new @SystemApis for RCS dependencies
As part of mainline, remove telephony dependencies from RcsService
and PresencePolling apps.

Bug: 147319232
Test: atest CtsTelephonyTestCases
Merged-in: Id25bfffc1c40db8b183206dc598165272da7356c
Change-Id: Id25bfffc1c40db8b183206dc598165272da7356c
2020-01-13 13:38:07 -08:00
Treehugger Robot
93db49faec Merge "Add Callback for Registration Failure" 2020-01-13 20:58:00 +00:00
Neil Fuller
99d116cbbb Merge "Remove android.telephony.action.NETWORK_SET_TIME" 2020-01-13 20:04:54 +00:00
Meng Wang
6d3e821058 Use com.android.telephony.Rlog for mainline module.
Bug: 144374158
Test: make
Merged-In: I86a479affb8e0fa8e48734324a6a05c68230d910
Change-Id: I86a479affb8e0fa8e48734324a6a05c68230d910
2020-01-13 10:32:55 -08:00
Calvin Pan
2d83e92bbd Merge "[Telephony Mainline] Add new api for Mvno matching" 2020-01-13 16:54:50 +00:00
Treehugger Robot
b2c3eaaf10 Merge "Use new UnsupportedAppUsage annotation." 2020-01-13 14:27:29 +00:00
Neil Fuller
260b1ba2db Remove android.telephony.action.NETWORK_SET_TIME
Remove the now-unused android.telephony.action.NETWORK_SET_TIME
intent.

Bug: 140712361
Test: treehugger
Test: atest com.android.server.timedetector
Merged-In: Ifa64d0dfa82a2db7742c0b3fcc76ad73b231a9f9
Change-Id: Ifa64d0dfa82a2db7742c0b3fcc76ad73b231a9f9
2020-01-13 09:05:15 +00:00
changbetty
9ec425857c [Telephony Mainline] Add new api for Mvno matching
Bug: 144977430
Test: make
Change-Id: I550e93ab8662c81068a6d52fef2e3c299607c18f
Merged-In: I550e93ab8662c81068a6d52fef2e3c299607c18f
2020-01-13 05:01:44 +00:00
Nathan Harold
f23960fa57 Expose sanitizeLocationInfo as SystemApi
To support scrubbing the CellIdentity field from
within TelephonyRegistry, based on the changes for
mainline, this needs to be a SystemApi.

Bug: 147152984
Test: make update-api && make
Merged-In: If1cb6519a3da60ff0afab001c2804aaa70923dac
Change-Id: If1cb6519a3da60ff0afab001c2804aaa70923dac
(cherry picked from commit 1af97c9d91)
2020-01-12 10:33:03 -08:00
Nathan Harold
c41cb737ed Add Callback for Registration Failure
Add a callback to PhoneStateListener to indicate that
a registration procedure has failed.

Bug: 143187047
Test: make update-api && make
Merged-In: I4a4ba4479dfd465a9d8063135f3b4bf4e1323e99
Change-Id: I4a4ba4479dfd465a9d8063135f3b4bf4e1323e99
(cherry picked from commit 5e6e983cad)
2020-01-12 10:33:03 -08:00
Sarah Chin
bbf2a83826 Merge "Update javadocs for API review" 2020-01-10 23:53:25 +00:00
Sarah Chin
393af8c53c Merge "Revert "Make MmsManager public"" 2020-01-10 22:44:46 +00:00
Meng Wang
00fe08f5bf Merge "Add a copy of Rlog for the telephony mainline module" 2020-01-10 22:05:03 +00:00
Sarah Chin
5dd05a4931 Revert "Make MmsManager public"
This reverts commit 2137c9bd39.

Reason for revert: Reverted internally

Change-Id: I6bed6facba681fa4abee739be50e21700b37c84a
Merged-In: I5952168aba996a10554406a9f1675ac3b04fa41f
2020-01-10 19:34:12 +00:00
Makoto Onuki
eba9902300 Add a copy of Rlog for the telephony mainline module
Bug: 144374158
Test: boot
Merged-In: I5be0497a17d00152286fe3351bf58e75b675ceb6
Change-Id: I5be0497a17d00152286fe3351bf58e75b675ceb6
(cherry picked from commit 57e56f2d3c)
2020-01-10 11:05:43 -08:00
Sarah Chin
c9e48d9403 Update javadocs for API review
Move plan requirements from Builder to SubscriptionPlan
Null and empty network types do not have the same behavior.
Clarify where plan requirements is enforced

Bug: 143550313
Test: none

Change-Id: I80c3b4425f317d5b4e9c685878c866742b706b85
Merged-In: I80c3b4425f317d5b4e9c685878c866742b706b85
2020-01-10 11:01:55 -08:00
Xiangyu/Malcolm Chen
3863c17fd2 Merge changes from topic "146593004"
* changes:
  Remove usage of @hide @Deprecated Telephony API in NPMS
  Use proper Telephony API to supply sim pin and puk.
  Hook supplyPin and supplyPuk to proper impl with subId specified
2020-01-10 18:53:42 +00:00
Sarah Chin
0262cb7765 Merge "5G meteredness for telephony framework" 2020-01-10 16:36:48 +00:00
Sarah Chin
b93ab62135 Merge "Make MmsManager public" 2020-01-10 16:33:55 +00:00
Meng Wang
9bda007cb8 Merge "Use Parcelable CellIdentity instead of CellLocation in AIDL." 2020-01-10 04:25:45 +00:00
James Lin
eb30d6184e Merge "[RCS] Create the new IMS RCS registration apis in AIDL ImsRcsController" 2020-01-10 01:45:56 +00:00
Yan Yan
614fd1b51b Merge changes from topic "include-uiccapptype"
* changes:
  Make mainline IPsec(IKE) to statically include @UiccAppType
  move UiccAppType to annotation class
2020-01-10 00:23:28 +00:00
Rambo Wang
fdd350b67a Merge "Deprecate some UICC related APIs in TelephonyManager" 2020-01-09 22:59:44 +00:00
Daniel Bright
a9298cc06f Merge "Flipping NR signal strengths coming from HAL" 2020-01-09 20:33:12 +00:00
Sarah Chin
2137c9bd39 Make MmsManager public
Test: atest TelephonyFrameworksTests
Bug: 144004293
Change-Id: I6cd3587ecba36c9ff9d45a6c174077e8dd7d8fb0
2020-01-09 12:16:41 -08:00