Commit Graph

5336 Commits

Author SHA1 Message Date
Allen Su
267b83e7d6 Merge "Convert some users of Time.format() to an alt." 2020-01-07 02:28:15 +00:00
Hall Liu
39839dc63b Create new APIs for overriding APNs
Create new APIs in TelephonyManager for DevicePolicyManager to add
override APNs, and use them in DevicePolicyManagerService instead of
directly accessing the APN database.

Bug: 146834818
Test: cts-tradefed run cts --module DevicePolicyManager --test
com.android.cts.devicepolicy.DeviceOwnerTest#testOverrideApn
Test: atest TelephonyManagerTest

Change-Id: I6c6214424169c05fd452db71a8c6593f8473b9d4
Merged-In: I6c6214424169c05fd452db71a8c6593f8473b9d4
2020-01-05 14:24:22 -08:00
Mark Chien
2410d67357 Merge "[Tether13] Move TetheringManager into framework" 2019-12-20 13:43:46 +00:00
Meng Wang
b3b63b67ac Do not setSubId on SmsMessage.
subId is not used anywhere.

Bug: 140908357
Test: make
Change-Id: I8d1786a8aa5f47886d0127a8009b1312e6d3010e
2019-12-19 14:13:12 -08:00
markchien
6d06f6d51a [Tether13] Move TetheringManager into framework
Move tethering out of ConnectivityService. All client would
use TetheringManager to talk with TetheringService directly.

Bug: 144320246
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: Ib051bea724a256f9c4572b566e46ae7b9c4abe6e
Merged-In: Ib051bea724a256f9c4572b566e46ae7b9c4abe6e
2019-12-19 20:53:06 +08:00
Betty Chang
e74c1f1278 Merge "[Telephony Mainline] Add SimInfo.CONTENT_URI instead SubscriptionManager.CONTENT_URI for mainline" 2019-12-17 02:53:41 +00:00
Neil Fuller
ee2d1af5d9 Convert some users of Time.format() to an alt.
Convert some frameworks/base/ users of android.text.format.Time.format()
to use calculations based on java.time instead. This avoids future
Y2038 issues associated with Time. A TimeMigrationUtils method is
added that has similar localization behavior to Time's format() method.

This commit only contains a replacement for basic formatting usecases.
Later commits can handle more complex usecases.

The only case that modifies the format is the changes to
CalendarContract.java: the pattern used there was unusual and only
used in logging/debug logic which was switched off by default.

Bug: 16550209
Test: build / boot / treehugger
Test: atest FrameworksCoreTests:android.text.format.TimeMigrationUtilsTest
Change-Id: Ib142979858012bb766b4c107d41a21b0324de506
Merged-In: Ib142979858012bb766b4c107d41a21b0324de506
2019-12-16 09:30:36 +00:00
Jayachandran Chinnakkannu
706ac54f75 Merge "Remove READ_SMS permission for ACTION_SMS_MMS_DB_CREATED" 2019-12-16 07:03:43 +00:00
Jack Yu
fd5241f120 Merge changes I5c5c4eb3,I36712447,I5b78d449
* changes:
  Throw illegal argument exception when slot index is invalid
  Code clean up
  Improved debug message
2019-12-14 04:15:39 +00:00
Jack Yu
45811ecc85 Code clean up
Remove database version 1~11 support since the format hasn't changed
in the past 7 years.

Bug: 135956699
Test: Manual
Merged-In: I367124471f16073bb47a31c094d161d36969acc1
Change-Id: I367124471f16073bb47a31c094d161d36969acc1
(cherry picked from commit 21effc8643)
2019-12-13 15:34:01 -08:00
Makoto Onuki
2da2629125 Remove "import JobService" to remove build time dependency
This is needed to move the jobscheduler classes to its own jar for
mainline.

Bug: 137763703
Test: Doc change only, presubmit
Merged-in: I117ffc23362a61923a9f93c1532ab582e2421402
(cherry-pick from I117ffc23362a61923a9f93c1532ab582e2421402)

Change-Id: I1b3fba3e90f4b3c943f44b63eeb776f5da973591
2019-12-13 13:56:36 -08:00
Jayachandran C
1637e44bb1 Remove READ_SMS permission for ACTION_SMS_MMS_DB_CREATED
Bug: 144739528
Test: Build
Change-Id: I27341bf7c1f6fc640ba51360f8a6035cdb86052b
2019-12-13 20:48:12 +00:00
SongFerngWang
afd025f4ab ServiceState merges voice and data into a single value
The voice and data is the same for operator name at ServiceState.
So ServiceState merges voice and data into a single value.
- merge the voice and data OperatorAlphaLong,OperatorAlphaShort, and
OperatorNumeric.

Bug: 144663018
Test: Build pass.
      atest NetworkControllerDataTest (PASS)
      atest ServiceStateTest (PASS)
      atest TelephonyMetricsTest (PASS)
      atest ServiceStateProviderTest (PASS)

Change-Id: I67e4a822c792bf9a9e174146ef8d65d9927d7612
Merged-In: I67e4a822c792bf9a9e174146ef8d65d9927d7612
2019-12-12 22:10:04 +08:00
changbetty
239b6ce359 [Telephony Mainline] Add SimInfo.CONTENT_URI instead SubscriptionManager.CONTENT_URI for mainline
Bug: 144972924
Test: make
Change-Id: I86c39f4a353412a66934b735957d5d06c478fe8e
Merged-In: I86c39f4a353412a66934b735957d5d06c478fe8e
2019-12-11 21:18:11 +08:00
Meng Wang
ddf215dd58 Merge "Remove telephony API usage: PhoneConstants.SUBSCRIPTION_KEY" 2019-12-05 23:23:51 +00:00
Meng Wang
646dcbd0ed Remove telephony API usage: PhoneConstants.SUBSCRIPTION_KEY
Replaced with SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX. Both are set
in Intent extras by SubscriptionManager#putPhoneIdAndSubIdExtra.

Bug: 140908357
Test: make
Change-Id: I54a65ef81acc68c34af6263e929634f15f05e494
2019-12-05 12:12:20 -08:00
Zoey Chen
8e708ff380 Merge "[Telephony mainline] Add SystemApi and NonNull annotation" 2019-12-05 07:58:03 +00:00
Jack Yu
258e925cd6 Merge "Added sub id to SmsCbMessage" 2019-12-04 17:34:01 +00:00
zoey chen
1acbb9c031 [Telephony mainline] Add SystemApi and NonNull annotation
Bug: 143860012
Test: make
Change-Id: I619d6ba04cb28830e3995feb02ffcb592ff65818
Merged-In: I619d6ba04cb28830e3995feb02ffcb592ff65818
2019-12-04 11:40:07 +08:00
Jack Yu
29dfebb84c Added sub id to SmsCbMessage
Added a new field subscription id to SMS
cell broadcast message.

This is the preliminary step of deprecating
CellBroadcastMessage class.

Bug: 144891074
Test: Manual

Merged-In: I23f61e77f6a9a16ce77f7892ba96fd7485c555a4
Change-Id: I23f61e77f6a9a16ce77f7892ba96fd7485c555a4
(cherry picked from commit 750b8b1972)
2019-12-03 11:43:59 -08:00
Zongheng Wang
6b30bf8a7f Merge "Move Bluetooth specfic APIs called in Settings to BT DatabaseManager"
am: 3908351777

Change-Id: I75c245ec452cc8b3918143500ea7f1dad7b0baa7
2019-12-02 14:15:58 -08:00
Treehugger Robot
3908351777 Merge "Move Bluetooth specfic APIs called in Settings to BT DatabaseManager" 2019-12-02 22:07:21 +00:00
Zongheng Wang
02f82e233d Move Bluetooth specfic APIs called in Settings to BT DatabaseManager
Bug: 142004000
Test: Manual
Change-Id: I45f93ce35813fff9677c2d41e6f31622bc04ca09
Merged-In: I89b0ab44920b1deefe7523e5f19ed1c799c4c658
2019-12-02 19:53:08 +00:00
Meng Wang
9b84a44f04 Merge "Move android.provider.Telephony to frameworks/base/core"
am: 4d0df870cd

Change-Id: I1015777c7fa0e5b67ea3d9da4c14036842b527aa
2019-11-27 13:31:23 -08:00
Meng Wang
6b2264a1cb Move android.provider.Telephony to frameworks/base/core
Bug: 145232482
Test: make
Change-Id: I49a9e8b1b5e3c99f0ed84638fc9f79202b0189b3
2019-11-27 11:06:43 -08:00
Meng Wang
9e294c69d3 Merge "Do not use hidden telephony API PhoneConstants.PRESENTATION_*"
am: 9636d7e3af

Change-Id: Id83ddc2f1b6d686e6249132f0e32b5a109e180cb
2019-11-19 22:07:44 -08:00
Treehugger Robot
9636d7e3af Merge "Do not use hidden telephony API PhoneConstants.PRESENTATION_*" 2019-11-20 04:26:47 +00:00
Meng Wang
91e4cc8a7c Do not use hidden telephony API PhoneConstants.PRESENTATION_*
Replaced with TelecomManager.PRESENTATION_*

Bug: 140908357
Test: make
Change-Id: Ib7c2531d69b14307e17ed5dd62f3aa8d56153330
2019-11-18 17:03:02 -08:00
Artur Satayev
59318bab67 Merge "Add @UnsupportedAppUsage to test apis that are known to be used by apps."
am: a98026f7aa

Change-Id: Ia39fbc2200aa7262e4a05b0710b7a382bb01b276
2019-11-13 10:33:06 -08:00
Artur Satayev
5a525851a8 Add @UnsupportedAppUsage to test apis that are known to be used by apps.
go/testapi-enforcement

Bug: 133832325
Test: m
Change-Id: Ifc8db120640a1554dcbf1722e61e09c7ddc65dd6
Merged-In: Ifc8db120640a1554dcbf1722e61e09c7ddc65dd6
2019-11-13 15:05:56 +00:00
Tyler Gunn
0f0dfaca35 Merge "More telephony updates for mainline."
am: 5be8504888

Change-Id: Ifbe3370b075651738e26c613c914dfb8e5ab3338
2019-11-11 19:41:26 -08:00
Tyler Gunn
5567d7408c More telephony updates for mainline.
Add new TelecomManager#getDefaultDialerPackage which is multiuse aware;
this is used when showing the voicemail notification.
Remove some @hide methods from Conference; push these inline.
Move ConferenceParticipantConnection into frameworks/opt/net/ims since
it is just an IMS implementation detail.

Bug: 141576016
Test: Manual smoke test.
Test: Run unit tests.
Test: Run CTS tests.
Change-Id: I39b6955cb14cc1ca68b05c620c3d09a2cdfe30c9
Merged-In: I39b6955cb14cc1ca68b05c620c3d09a2cdfe30c9
2019-11-08 21:27:32 +00:00
Hall Liu
5925c3bb29 Merge "Add new SystemApi methods for mainline"
am: f363f3549e

Change-Id: I463ca5c1745b236e5771808e70d77edd744a3714
2019-11-08 07:57:39 -08:00
Hall Liu
d2f962a6db Add new SystemApi methods for mainline
Add new SystemApi methods for Telecom to call in lieu of the old @hide
methods. Also moved CallerInfo and CallerInfoAsyncQuery to Telecom
because there are no more users in Telephony.

Bug: 141576016
Test: CTS
Change-Id: I458ba6bcfc03db72c0419b0cab2f0d0adfa971d4
Merged-In: I458ba6bcfc03db72c0419b0cab2f0d0adfa971d4
2019-11-07 17:22:28 -08:00
TreeHugger Robot
abc015499a Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master 2019-10-31 18:38:40 +00:00
Phil Weaver
f4d1789b81 Merge "a11y: don't crash the system when illegal component name encounted" 2019-10-31 01:29:30 +00:00
Xin Li
6f48900f50 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
Bug: 142003500
Change-Id: If5056a73ede668b0048ca107b686413695e5b3b6
2019-10-30 14:33:01 -07:00
Xin Li
b2198fa670 Merge "Merge Coral/Flame into AOSP master" 2019-10-27 04:44:29 +00:00
Chen Xu
3f1055a2ba Merge "make CallerInfo as SystemAPI"
am: 7e902363a6

Change-Id: I7615196e88b03a733daa895e9ffb7ee3d7a47034
2019-10-25 10:37:43 -07:00
Chen Xu
fba9ca44a2 make CallerInfo as SystemAPI
1. move CallerInfo from telephony.internal to andorid.telephony package
2. expose APIs inside CallerInfo which are consumed by non-telephony
code.

Bug: 140908357
Test: Build
Change-Id: Ie95897c77e97e40f5357c107aede82edfea44d5a
(cherry picked from commit b9a1eefec6)
Merged-in: Ie95897c77e97e40f5357c107aede82edfea44d5a
2019-10-21 21:39:58 -07:00
Xin Li
5c4d37fc17 DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
Bug: 141248619
Change-Id: I078f35ceef06ae7d08c5de385fd023c71c1ecbac
2019-10-14 22:54:53 +00:00
joshmccloskey
2c712acefa Added secure setting for face re enrollment.
am: cfc621518c

Change-Id: If3ed42ee2cebd112a5d243eab516f25dc3946e92
2019-09-26 20:06:54 -07:00
joshmccloskey
cfc621518c Added secure setting for face re enrollment.
Test: Verified that the flag could be modified with
adb shell settings put secure...
Bug: 141380252

Change-Id: Ifa24b688a487482e5b02689c1046d85423f73280
2019-09-26 15:54:45 -07:00
Amit Mahajan
0c8c4978ab Merge "Fix descriptions for default SIM in global preferences" am: eeeb74a093 am: f87866ba9f
am: fd8765b95e

Change-Id: I1ce7fc6f311f9462f1f505ef5387b2416728c794
2019-09-17 10:49:05 -07:00
Amit Mahajan
fd8765b95e Merge "Fix descriptions for default SIM in global preferences" am: eeeb74a093
am: f87866ba9f

Change-Id: I93c5b77138ce7b23e27371a7be15f00e25b987e1
2019-09-17 10:43:02 -07:00
Amit Mahajan
f87866ba9f Merge "Fix descriptions for default SIM in global preferences"
am: eeeb74a093

Change-Id: Ie4e492062c0c1a91b36abce43fde3506ae2cbc60
2019-09-17 10:31:23 -07:00
Taesu Lee
0399854df0 Fix descriptions for default SIM in global preferences
Test: Not required.

Change-Id: I7f32eb495b53d13aba50b07d86e63f0549e9e6bb
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2019-09-17 13:45:54 +09:00
Mady Mellor
fd48588768 Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev 2019-09-16 21:55:51 +00:00
Mady Mellor
a5813e0e3d qt-r1-bubbles-dev @ build 5835883
Test: presubmit setup on source branch

Bug: 126945401
Bug: 128932906
Bug: 129158983
Bug: 130237686
Bug: 130250809
Bug: 130442248
Bug: 131267438
Bug: 131609280
Bug: 131692350
Bug: 131849856
Bug: 133444037
Bug: 134064116
Bug: 134064858
Bug: 134070807
Bug: 134077101
Bug: 134090085
Bug: 134155107
Bug: 134423445
Bug: 134512898
Bug: 134514210
Bug: 134514227
Bug: 134734945
Bug: 134960381
Bug: 134989736
Bug: 135214687
Bug: 135280077
Bug: 135472021
Bug: 135475155
Bug: 135487618
Bug: 135488406
Bug: 135518045
Bug: 135633218
Bug: 136034310
Bug: 136150954
Bug: 136199542
Bug: 136538998
Bug: 137201711
Bug: 137213469
Bug: 137214359
Bug: 137214536
Bug: 137233453
Bug: 137876221
Bug: 138301618
Bug: 138445026
Bug: 138659213
Bug: 138749133
Bug: 138799651
Bug: 138801505
Bug: 138941969
Bug: 139002444
Bug: 139025304
Bug: 139816141
Change-Id: Ia7364529ea58070c8d45ecd726ab6ac7d34f2abe
Merged-In: Ic271a6a0f0803941dd5a84124dabf4d8c5fcc755
Merged-In: Ic3a4ba793db7f1361678ef51c411d9eab85d9b85
2019-09-11 22:42:54 +00:00
Mady Mellor
3e3e48e981 Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev-plus-aosp 2019-09-11 22:40:21 +00:00