Commit Graph

5395 Commits

Author SHA1 Message Date
Brad Ebinger
47c65ba67b Add IMS_RCS_UCE_ENABLED column to SimInfo database
am: 41c232c7bc

Change-Id: I622957ba0bf60f74094cd6c06ea8d041a265ff26
2020-01-27 11:08:16 -08:00
calvinpan
c64805d392 Merge "Redesign the setPreferredNetworkType"
am: 53b272d680

Change-Id: I9dec551a3aeb71edd52d33d1e92bb385bca7cf19
2020-01-24 16:12:48 -08:00
Brad Ebinger
41c232c7bc Add IMS_RCS_UCE_ENABLED column to SimInfo database
Add the ability for the user to turn on/off UCE in settings.

Bug: 148167203
Test: atest CtsTelephonyTestCases:RcsUceAdapterTest
Merged-In: Ic53a9ef32343bfa4d96c2cf7fc0f0791265d2bd1
Change-Id: Ic53a9ef32343bfa4d96c2cf7fc0f0791265d2bd1
2020-01-24 13:39:22 -08:00
calvinpan
d77e0bde77 Redesign the setPreferredNetworkType
Some APPs(like OMA DM) might enable or disable 5G settings, so redesign
the setPreferredNetworkType behavior.

1. Create allowed_network_type in telephonyprovider
2. Create get/set allowed network type API
3. When APPs call setPreferredNetworkType() that will AND with allowed
network type.

Bug: 136730709
Test: By Manual
1. setAllowedNetwork to disable 5G
2. setPreferredNetworkTypeBitmask to set NR_LTE_GSM_WCDMA
3. framework set LTE_GSM_WCDMA to modem
Merged-In: Ia257e6ddaa33c32bc09340a59c9daf71ce1fa8cf
Change-Id: Ia257e6ddaa33c32bc09340a59c9daf71ce1fa8cf
2020-01-24 13:23:27 -08:00
Peter Wang
caabef3f2c Merge "[Telephony Mainline] Expose APIs in SubscriptionManager"
am: c0e02ab436

Change-Id: I8599664e033e579f18acf30203fa3ff9207122a2
2020-01-24 10:37:27 -08:00
Treehugger Robot
c0e02ab436 Merge "[Telephony Mainline] Expose APIs in SubscriptionManager" 2020-01-24 18:31:32 +00:00
Automerger Merge Worker
5a4ec31b04 Merge "Expose CARRIER_APPS_HANDLED as system API" am: eb7dddb9ab
Change-Id: I26b62ee0613191cff39e975f145bda8e7b54fe87
2020-01-23 23:05:38 +00:00
Peter Wang
78af57db36 [Telephony Mainline] Expose APIs in SubscriptionManager
Bug: 146362772
Fix: 146362772
Test: Build, TelephonyProviderTest
Merged-In: Icaff3117cab45e6458931a600fa8d63821e0fe13
Change-Id: Icaff3117cab45e6458931a600fa8d63821e0fe13
2020-01-23 13:03:37 -08:00
Meng Wang
f03b011ee6 Expose CARRIER_APPS_HANDLED as system API
Bug: 148171388
Test: make
Change-Id: Ia6ea92f1cc29dd3706fbf2f8820551240c847dce
2020-01-22 14:59:27 -08:00
Xin Li
e13851556b DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
Bug: 146167222
Change-Id: Ifeb003ec9b3bf824f04d31a117aea65d517241fb
2020-01-15 16:15:41 -08: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
Chen Xu
32f525c975 support data migration from OEM legacy app to mainline
Defined systemAPI for interaction with legacy cellbroadcast app

Bug: 135956699
Test: Tested with cell broadcast receiver test app and confirmed data can be migrated.
Merged-In: I6e583672a3673fd226e14d33d7a7648f4fd03efb
Change-Id: I6e583672a3673fd226e14d33d7a7648f4fd03efb
(cherry picked from commit ad2f91fc6d)
2020-01-14 22:54:58 +00:00
Treehugger Robot
89ac95017f Merge "Use new UnsupportedAppUsage annotation." 2020-01-13 13:35:38 +00:00
Treehugger Robot
9938c70fb5 Merge "Use new UnsupportedAppUsage annotation." 2020-01-13 13:05:17 +00:00
Artur Satayev
bc3d8b9071 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
Change-Id: I534e3fd1305e2f4af076986770033478448a665c
Merged-In: I534e3fd1305e2f4af076986770033478448a665c
2020-01-13 12:39:59 +00:00
Automerger Merge Worker
692d0700c9 Merge "Expose check write setting operation as system API" am: 6978df2cb6 am: ff1e9a9b93
Change-Id: Ifb553e901b849e53b196881b190e4d05c5855a9c
2020-01-10 11:23:52 +00:00
Mark Chien
6978df2cb6 Merge "Expose check write setting operation as system API" 2020-01-10 11:06:38 +00:00
Artur Satayev
2d330f6fa8 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
Change-Id: I288969b0c22fa3a63bc2e71bb5009fe4a927e154
Merged-In: I288969b0c22fa3a63bc2e71bb5009fe4a927e154
2020-01-09 15:08:18 +00:00
Automerger Merge Worker
b8a97000e9 Merge "Expose some tethering constants in Settings" am: 07dcca55fc am: 2173a4d07e
Change-Id: I1231b6fdfb8373dd03ac34649769d90163063bf1
2020-01-09 12:13:35 +00:00
markchien
e64a799169 Expose check write setting operation as system API
If tethering provisioning check is required, caller must have tethering
privilege permission to change tethering. If provisioning is not needed,
caller who has write settings permisssion also can change tethering.
Expose checkAndNoteWriteSettingsOperation for tethering check whether
caller has write settings permission.

Bug: 144814607
Test: -build, flash, boot
      -atest SettingsTest#testCheckWriteSettingsOperation
Change-Id: Ib3931bbe39361c2c4324935f16473cc675848032
2020-01-09 09:54:53 +00:00
markchien
9845e908d0 Expose some tethering constants in Settings
Make some tethering constants @systemApi because tethering
cannot use hide Api.

Bug: 144814607
Test: build, flash, boot
Change-Id: I8b46e2483eec575cddaad392d055551b75ca71ef
2020-01-09 08:48:55 +00:00
Automerger Merge Worker
646bdf8e89 Merge "Convert some users of Time.format() to an alt." am: 267b83e7d6 am: 1b0c2fcd3b
Change-Id: I1cb9722000898c9d1a7d479e9b0d88f717c57414
2020-01-07 03:25:07 +00:00
Allen Su
267b83e7d6 Merge "Convert some users of Time.format() to an alt." 2020-01-07 02:28:15 +00:00
Automerger Merge Worker
3db9e958ab Merge "Create new APIs for overriding APNs" am: 13beb87783 am: 4d1771a3fb
Change-Id: I202aa723edabdca84eddb679233ac0dcf6cfacd2
2020-01-07 00:10:24 +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
Automerger Merge Worker
08074c62b0 Merge "[Tether13] Move TetheringManager into framework" am: 2410d67357 am: 25cc1f47c5
Change-Id: I9ec25eb984e3b534ddcc9313836a319b21526998
2019-12-20 14:00:29 +00:00
Mark Chien
2410d67357 Merge "[Tether13] Move TetheringManager into framework" 2019-12-20 13:43:46 +00:00
Automerger Merge Worker
a9a1cc68f7 Merge "Do not setSubId on SmsMessage." am: 0330797929 am: 50080aa1ae
Change-Id: I2f08915cb59ae1999922ca4bc874b9d1903fc053
2019-12-20 00:26:55 +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
Automerger Merge Worker
b53b1f67d6 Merge "[Telephony Mainline] Add SimInfo.CONTENT_URI instead SubscriptionManager.CONTENT_URI for mainline" am: e74c1f1278 am: fe520a7567
Change-Id: I03f3023ad48b2663c58234ede2deefd0ea80a881
2019-12-17 03:23:37 +00: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
Automerger Merge Worker
c522c31070 [DO NOT MERGE] Add country blacklist support am: 97dad931df
Change-Id: Idfb887291164bd0962b1e78e2646a0d9ad6ad5ca
2019-12-16 21:54:20 +00:00
Alex Lin
97dad931df [DO NOT MERGE] Add country blacklist support
Adding a country blacklist, except for pixel2(walleye, taimen) will still uses whitelist
Bug: 144702079
Test: manually tested

Change-Id: I21c146556e5406ecf5c72f74767ea8d5fc643aec
2019-12-16 12:30:39 -08: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
Automerger Merge Worker
375bfacf9e Merge "Remove READ_SMS permission for ACTION_SMS_MMS_DB_CREATED" am: 706ac54f75 am: 2957a01905
Change-Id: I631ce9139237f91476000c8476b21f09edfcd788
2019-12-16 08:15:35 +00:00
Jayachandran Chinnakkannu
706ac54f75 Merge "Remove READ_SMS permission for ACTION_SMS_MMS_DB_CREATED" 2019-12-16 07:03:43 +00:00
Automerger Merge Worker
8b5ab0fce2 Merge changes I5c5c4eb3,I36712447,I5b78d449 am: fd5241f120 am: 2d5bf0b845
Change-Id: I02040c779e3537d02389a7c6408761122dcad284
2019-12-14 06:19:49 +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
Automerger Merge Worker
619bf038e3 Merge "Remove "import JobService" to remove build time dependency" am: ac335868bf am: 848155a0fb
Change-Id: Icff1d6211fbbe2a511aac937a6765a678419ebed
2019-12-14 00:24:08 +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
Automerger Merge Worker
fd02e6e693 Merge "ServiceState merges voice and data into a single value" am: 72f579d5f2 am: 4b108f74f6
Change-Id: Ia68eb336d8b916cb93b83ba14b6423560f29a42d
2019-12-13 21:48:35 +00: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
Jeff Sharkey
30b412cab7 Apply Dark theme changes when screen off only
this change waits to apply ui changes after screen off
battery manager sends updates and continuously updates the ui mode

this change also applies external changes to ui configurations when
the mode is actually changed. this resolves some perfromance regression
issues

Fixes: 145694649
Fixes: 145161355
Fixes: 145776479

Test: atest UiModeManagerService
Change-Id: Ib769df4302d1c09166e2dc456b8ced35daa4d0b7
Merged-In: Ib769df4302d1c09166e2dc456b8ced35daa4d0b7
2019-12-12 19:25:07 +00:00
Jeff Sharkey
216c08e460 Apply Dark theme changes when screen off only
this change waits to apply ui changes after screen off
battery manager sends updates and continuously updates the ui mode

this change also applies external changes to ui configurations when
the mode is actually changed. this resolves some perfromance regression
issues

Fixes: 145694649
Fixes: 145161355
Fixes: 145776479

Test: atest UiModeManagerService
Change-Id: Ib769df4302d1c09166e2dc456b8ced35daa4d0b7
Merged-In: Ib769df4302d1c09166e2dc456b8ced35daa4d0b7
2019-12-12 18:51:02 +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
Automerger Merge Worker
73b581f0dd Revert "DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings" am: db70de3656
Change-Id: I0a695d10ecca6134e851c0e482af7318de4fdb95
2019-12-11 17:10:03 +00: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
Jian Jin
db70de3656 Revert "DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings"
This reverts commit ba4b561c3e.

Reason for revert: Move to CarSettings

Change-Id: I91fd1fa7dee2400095a014c189a40706b853c471
2019-12-11 00:35:05 +00:00