Commit Graph

8412 Commits

Author SHA1 Message Date
Nathan Harold
bbc2aaeaaa Merge changes from topic "barring-info"
* changes:
  Add a BARRING_TYPE_UNKNOWN for Unreported Barring
  Add Callback to notify changes of barring status
2020-01-16 00:06:07 +00:00
Automerger Merge Worker
1d81656f37 Merge "Add javadoc @see to methods affected by resetAllCarrierActions" am: aa7d4c540d am: ecc022802a am: 3e2801d77d
Change-Id: I9aa37d2d76cb0665faaf01826b68df59c40f8821
2020-01-15 21:57:03 +00:00
Automerger Merge Worker
3e2801d77d Merge "Add javadoc @see to methods affected by resetAllCarrierActions" am: aa7d4c540d am: ecc022802a
Change-Id: I4a7d46ff9f1baaf90ce23bb8d3a8035823ac70b2
2020-01-15 21:40:28 +00:00
Treehugger Robot
aa7d4c540d Merge "Add javadoc @see to methods affected by resetAllCarrierActions" 2020-01-15 21:15:13 +00:00
TreeHugger Robot
9edf72d041 Merge "Modify the build version to match changeId stuff" 2020-01-15 19:36:32 +00:00
Automerger Merge Worker
f20fa91702 Merge "Expose ServiceState#getDataNetworkType as SystemApi" am: 38fa60b511 am: 370a934081 am: e3faa5f0ab
Change-Id: I7cb7081d62ca6be991bcc85ddc357594ab50b2ae
2020-01-15 19:32:42 +00:00
Automerger Merge Worker
e3faa5f0ab Merge "Expose ServiceState#getDataNetworkType as SystemApi" am: 38fa60b511 am: 370a934081
Change-Id: Ieb226d39bf3a8990c134a9e6e67f50e3c2135ed1
2020-01-15 19:22:15 +00:00
Automerger Merge Worker
cb5b958917 Merge "Cleanup ITelephony in TelephonyPermissions with new System API. This method is used by Telephony Module for permission checking." am: 725c54065d am: 3a6b29da40
Change-Id: I10447351e53ff84e6b2c747574080741189c6206
2020-01-15 19:14:45 +00:00
Hall Liu
38fa60b511 Merge "Expose ServiceState#getDataNetworkType as SystemApi" 2020-01-15 19:09:19 +00:00
Peter Wang
909d3a2149 Merge "[Telephony Mainline] Removed IPackageManager reference" 2020-01-15 19:01:47 +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
Automerger Merge Worker
a166b4c136 Merge "Use new UnsupportedAppUsage annotation." am: c764cb634d am: fcde297afb
Change-Id: I8d7ae39c3b292efb3ed55fe5743da2e5872f5890
2020-01-15 14:23:06 +00:00
Treehugger Robot
c764cb634d Merge "Use new UnsupportedAppUsage annotation." 2020-01-15 13:29:02 +00:00
Automerger Merge Worker
d3cb54c8d9 Merge "[RCS] Implement notifyRcsAutoConfigurationReceived()" am: b498fbf860 am: b7336f1d23 am: f01f6aec2f
Change-Id: I93ebc67677fc326871ba151a4b6bae0bc60e197d
2020-01-15 03:36:50 +00:00
Automerger Merge Worker
09f2c4778c Merge "Created an API to get encoded message of SubmitPuds" am: d48914249d am: 5ea4055499
Change-Id: I8acc8ab681a66eb86b0cefd72e2500838eff379e
2020-01-15 03:25:27 +00:00
Automerger Merge Worker
f01f6aec2f Merge "[RCS] Implement notifyRcsAutoConfigurationReceived()" am: b498fbf860 am: b7336f1d23
Change-Id: If317967b103c8b797a74b089c13b518c33b60465
2020-01-15 03:24:56 +00:00
Shuo Qian
a78143c86a Modify the build version to match changeId stuff
Test: Treehugger
Bug: 145147528
Bug: 147600208
Change-Id: I4294359fc7bcf4d739b6e01439dc47fa99999d2c
2020-01-14 19:16:31 -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
Bonian Chen
4c1b1ff615 Merge "[Settings] Expose @hide APIs as @SystemApi" 2020-01-15 01:04:01 +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
Automerger Merge Worker
2ba0fb04a4 Merge changes from topic "remove_dev_mode" am: 8027ca9b97 am: b321ddb2f2
Change-Id: I8fe01cc3b1a669fb4e7516f37471dc8fe5493cde
2020-01-14 23:58:13 +00: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
Sarah Chin
febf744282 Merge "Remove @hide for CarrierConfigManager constants" 2020-01-14 22:52:11 +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
Nathan Harold
d5b9cc737b Add a BARRING_TYPE_UNKNOWN for Unreported Barring
For vendors that do not support barring info reports,
add an additional BARRING_TYPE to express the difference
between unbarred and unknown barring status.

Bug: 143226991
Test: make update-api && make && atest BarringInfoTest
Change-Id: Ie9314c5612536bf181a3c0e52876b1804ed7cce2
2020-01-14 13:54:09 -08:00
Nathan Harold
c564b1dc33 Add Callback to notify changes of barring status
-Create a BarringInfo class to pass Barring information
 from HAL to PhoneStateListener.
-Add a multi-callback registrant so that ServiceStateTracker
 and potentially DcTracker can also listen to barring info in
 the future.

Bug: 143226991
Test: make update-api && make && atest BarringInfoTest
Change-Id: I08240259f3142beeca991238bf705236f0303954
2020-01-14 13:54:09 -08:00
Daniel Bright
f16dc0708a Merge "Rewriting phone constants for mainline" 2020-01-14 21:14:35 +00:00
Roland Levillain
50b12192b7 Merge "Revert "TelephonyManager: cache service handles"" 2020-01-14 19:26:38 +00:00
Automerger Merge Worker
b74675a238 Merge changes Iec082f0c,I86a479af am: 52cc4a4321 am: 30a1749f8e
Change-Id: Ibf943b652da9c94aedd8c58952cf84b90e7bdca2
2020-01-14 19:21:07 +00:00
Automerger Merge Worker
f30c746b69 Merge "Add new @SystemApis for RCS dependencies" am: 6408fa473f am: dd840cdaae
Change-Id: I307990e1b794a659b5110406794ba927d223be86
2020-01-14 18:17:11 +00: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
Roland Levillain
052535ef59 Revert "TelephonyManager: cache service handles"
Revert "Disable Telephony service handle caching while testing."

Revert submission 9592007-telephony-handle-caching

Reason for revert: Breaks tests
(com.android.cellbroadcastreceiver.unit.CellBroadcastConfigServiceTest,
com.android.bluetooth.hfp.HeadsetPhoneStateTest).

Reverted Changes:
If9bb6840c: TelephonyManager: cache service handles
I3b525c504: Disable Telephony service handle caching while tes...

Bug: 147656950
Bug: 147655973
Bug: 147658833
Bug: 147658836
Bug: 147658970
Bug: 140788621
Change-Id: Id4eb23c237c514c86af92a85c8637404eca1c357
2020-01-14 14:31:44 +00:00
Peter Wang
e8a2a8439e [Telephony Mainline] Removed IPackageManager reference
Bug: 140908357
Test: Build
Change-Id: I53d7d98b9689c1b4f764c24fc17bb488adcf96b5
2020-01-13 23:33:56 -08:00
Sarah Chin
a912e113f8 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
2020-01-13 23:10:59 -08:00
Automerger Merge Worker
07cf194254 Merge "[Telephony Mainline] Add new SystemApi method and SystemApi annotation for mainline" am: 9f48bdc383 am: ee1e3f4969
Change-Id: I5a749fab6007fe4f17f6e9752eb0b9a35b9c0ea0
2020-01-14 06:41:23 +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
zoey chen
55957fccfb [Settings] Expose @hide APIs as @SystemApi
Add new SystemApi methods for Cdma preference controller

Bug: 145788881
Test: make
Change-Id: I04803885d2367f0b79471aaab66b7a0e8e6a912d
2020-01-14 12:04:16 +08:00
Betty Chang
2cb542fd20 Merge "[Mainline] Add get and set premium sms consent method and make as @SystemApi" 2020-01-14 03:51:34 +00:00
TreeHugger Robot
de6f60a91f Merge "Use changeID and Compatibility.isChangeEnabled for Mainline" 2020-01-14 03:15:38 +00:00
Radhika Agrawal
8727e151a4 Merge "Add rtp silence detection and inactivity detection to call quality" 2020-01-14 01:32:17 +00:00
Collin Fijalkovich
3e5b5de760 Merge "TelephonyManager: cache service handles" 2020-01-14 01:09:15 +00:00
Shuo Qian
d0c818129a Use changeID and Compatibility.isChangeEnabled for Mainline
Test: Treehugger
Bug: 145147528
Bug: 147600208

Change-Id: I8092f4c7d3be046da337cdcbadeed89844b3aaab
2020-01-13 17:04:14 -08:00
Zongheng Wang
d562ed7c2b Merge "Created an API to get encoded message of SubmitPuds" 2020-01-14 00:59:34 +00:00