Commit Graph

5374 Commits

Author SHA1 Message Date
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
Automerger Merge Worker
5e1e8b2756 DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings am: ba4b561c3e
Change-Id: I853bb7f04816151b34e7adcd024d31d971561558
2019-12-10 22:34:47 +00:00
Jian Jin
ba4b561c3e DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings
Bug: 144846684
Test: SettingsProviderTest
Change-Id: Iebc53c70ea401c6ba244ed43db7a1d73f3a894df
2019-12-09 14:07:26 -08:00
Meng Wang
4f47555359 Merge "Remove telephony API usage: PhoneConstants.SUBSCRIPTION_KEY" am: ddf215dd58
am: cb0d068f28

Change-Id: If502b6af63c532f5c87b384096680f7435018874
2019-12-05 15:37:24 -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
aeab4bda93 Merge "[Telephony mainline] Add SystemApi and NonNull annotation" am: 8e708ff380
am: ae95a26703

Change-Id: Id649a4f73b750d957eaa11b7ddf350c62b0d354a
2019-12-05 00:16:29 -08:00
Zoey Chen
8e708ff380 Merge "[Telephony mainline] Add SystemApi and NonNull annotation" 2019-12-05 07:58:03 +00:00
Jack Yu
b496fd8765 Merge "Added sub id to SmsCbMessage" am: 258e925cd6
am: 35132f9a21

Change-Id: Ia2e5933ffc493c69efbac8da2ab993281e31867b
2019-12-04 09:47:53 -08: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
4d701d0101 Merge "Move Bluetooth specfic APIs called in Settings to BT DatabaseManager" am: 3908351777
am: 6b30bf8a7f

Change-Id: I237a8c05c9e09cc09a4a096734c6af556b9bc283
2019-12-02 14:19:52 -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
fba2c8041a Merge "Move android.provider.Telephony to frameworks/base/core" am: 4d0df870cd
am: 9b84a44f04

Change-Id: Ib87b7648cf7cc19b267770a6f1fd910f751c7ab8
2019-11-27 13:38:32 -08: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
Dan Sandler
486ad0d659 Action chips in share sheet. (DO NOT MERGE)
am: 0d3e358628

Change-Id: I0df785ea4279811fe4f556f67dde8e3c6cef98b0
2019-11-25 05:28:10 -08:00
Dan Sandler
0d3e358628 Action chips in share sheet. (DO NOT MERGE)
Move the Copy button to a new row of chips below the
(now larger) preview. Optionally, if a proximity-sharing
service is installed, show that chip as well.

Bug: 143229724
Fixes: 144290152
Test: atest SystemUITests frameworks/base/core/tests/coretests
Change-Id: I0d6457df85bc937f72ca97da6b4b84b634a90daf
2019-11-24 23:39:49 +00:00
Meng Wang
40a2f98c71 Merge "Do not use hidden telephony API PhoneConstants.PRESENTATION_*" am: 9636d7e3af
am: 9e294c69d3

Change-Id: Iddbe0533660d30d86ee932b481020b85eb91e176
2019-11-19 22:13:30 -08:00