Commit Graph

96363 Commits

Author SHA1 Message Date
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
2957a01905 Merge "Remove READ_SMS permission for ACTION_SMS_MMS_DB_CREATED"
am: 706ac54f75

Change-Id: I6a2fc8d9191dc77fe3f7392afe8d874cdf58a839
2019-12-16 00:04:48 -08: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
956b783f7c Merge "Pipe featureId from app to noteOp in BT code" am: 775540c6d6 am: 6f2b986ee4
Change-Id: Ia2d0a51a73020b81cb8991ff783fa826328265cc
2019-12-14 18:00:45 +00:00
Philip P. Moltmann
6f2b986ee4 Merge "Pipe featureId from app to noteOp in BT code"
am: 775540c6d6

Change-Id: I0d9a1f47328f8fd47e84859e33a6e559ccb77ebd
2019-12-14 09:42:22 -08:00
Treehugger Robot
775540c6d6 Merge "Pipe featureId from app to noteOp in BT code" 2019-12-14 17:36:47 +00:00
Automerger Merge Worker
560eac460c Merge "remove API RoleManager.getFinancialSms" am: c0fa362e1b am: 679980cbca
Change-Id: I6f5db398a52a01b3fcc5b7a672d39f92dcd93479
2019-12-14 08:19:38 +00:00
Chen Xu
679980cbca Merge "remove API RoleManager.getFinancialSms"
am: c0fa362e1b

Change-Id: I435dd9621f0a36536403c27a24c8072f7c9936f0
2019-12-14 00:02:03 -08:00
Chen Xu
c0fa362e1b Merge "remove API RoleManager.getFinancialSms" 2019-12-14 06:57:48 +00:00
Automerger Merge Worker
b6c05be16d move IApnSourceService.aidl to android.service.carrier am: 2a03dd50ce am: f3304cec72
Change-Id: Idfbfe4e5420eeeb2d364145e0676762905be3c9b
2019-12-14 06:21:49 +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
Chen Xu
f3304cec72 move IApnSourceService.aidl to android.service.carrier
am: 2a03dd50ce

Change-Id: Icb6e2e2cf89ad53dfc1af2a90d138145a22f634e
2019-12-13 22:09:00 -08:00
Jack Yu
2d5bf0b845 Merge changes I5c5c4eb3,I36712447,I5b78d449
am: fd5241f120

Change-Id: I656e66400a1a328e5236bd3e3dfd30d291f7d858
2019-12-13 22:05:05 -08:00
Chen Xu
435d1c1a53 remove API RoleManager.getFinancialSms
getFinancialSms is not functional and not used today, thus
remove it to avoid future confusion

Bug: 138745655
Bug: 140908357
Test: atest android.telephony.cts.SmsManagerTest
Change-Id: Ib57d0fc189b6c894227894ee02b592f7ee46f22f
(cherry picked from commit d6b2673181)
Merged-in: Ib57d0fc189b6c894227894ee02b592f7ee46f22f
2019-12-13 20:48:41 -08:00
Chen Xu
b25174e9d0 Merge changes from topic "cpcpcp"
* changes:
  move encodeException to non-updatable framework/base/telephony/common
  move IApnSourceService.aidl to android.service.carrier
  use SmsCbMessage.MESSAGE_FORMAT_3GPP to replace hidden SmsMgr APIs
  apply correct @SystemAPI for PackageManager
2019-12-14 04:16:54 +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
Chen Xu
2a03dd50ce move IApnSourceService.aidl to android.service.carrier
Bug: 140908357
Test: Build & Manual
Change-Id: I21b83798f5ecd819627a7168c167cf3cfe99dd68
(cherry picked from commit 478ba408d3)
Merged-in: I21b83798f5ecd819627a7168c167cf3cfe99dd68
2019-12-13 17:04:23 -08: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
Makoto Onuki
848155a0fb Merge "Remove "import JobService" to remove build time dependency"
am: ac335868bf

Change-Id: I9aa2595a7c8024f4c5d34bc63a5d70ebce41ce15
2019-12-13 16:02:34 -08: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
SongFerng Wang
4b108f74f6 Merge "ServiceState merges voice and data into a single value"
am: 72f579d5f2

Change-Id: I371f56959c9d1204022c37b67c8f821ed737297d
2019-12-13 13:27:54 -08:00
SongFerng Wang
72f579d5f2 Merge "ServiceState merges voice and data into a single value" 2019-12-13 21:07:17 +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
Tony Mak
dbdf483f31 Merge "Put userId at the end of parcel" into qt-dev am: 899f8301e0 am: 056b56c6b7
am: aea739b3f4

Change-Id: Ib5dfc58a7d53e0732959083fa2e6fcfd6e66f29d
2019-12-13 11:36:08 -08:00
Automerger Merge Worker
aea739b3f4 Merge "Put userId at the end of parcel" into qt-dev am: 899f8301e0 am: 056b56c6b7
Change-Id: Id17055f72243306cac9e46abff2cf313492f5e7c
2019-12-13 19:31:04 +00:00
Automerger Merge Worker
056b56c6b7 Merge "Put userId at the end of parcel" into qt-dev am: 899f8301e0
Change-Id: If6ce5c989102c8fb6cdc1fa82cde79817f6c3423
2019-12-13 19:11:21 +00:00
Automerger Merge Worker
4c1644cdf0 Merge "Resolve BluetoothHearingAid API usages by Settings" am: a83641557b am: 1099497d45
Change-Id: I4708867d2e125bfa1adc27cf18817a5e7d90046d
2019-12-13 18:50:48 +00:00
Philip P. Moltmann
22209940e8 Pipe featureId from app to noteOp in BT code
FeatureIds are not yet available, hence in BTManager we assume always a
"null" featureId.

The effect of this change is that for apps that opt into using
featureIds, they will have one BluetoothAdapter per feature, not one per
process as before. In my testing this caused no problem. Most apps
won't use featureIds, hence for most apps there is no change in
behavior.

Test: used bluetooth
Bug: 136595429
Change-Id: Ic40326ea331c60f764f213bb2673cb4c49a81604
2019-12-13 10:49:16 -08:00
Rahul Sabnis
1099497d45 Merge "Resolve BluetoothHearingAid API usages by Settings"
am: a83641557b

Change-Id: Iab058a5e869d6b25b5d256b1f6c0ee5fcedc1c1e
2019-12-13 10:28:30 -08:00
Treehugger Robot
a83641557b Merge "Resolve BluetoothHearingAid API usages by Settings" 2019-12-13 18:15:36 +00:00
Automerger Merge Worker
506fdff8c3 Merge changes from topic "services_stub" am: 34e4b2c3ab am: 776b4544fe
Change-Id: I284b912dc36547530a7beeb4ccc441c8270d9131
2019-12-13 08:17:05 +00:00
Jiyong Park
776b4544fe Merge changes from topic "services_stub"
am: 34e4b2c3ab

Change-Id: I307121c43394cc6183fead0045702bbbcf3d350c
2019-12-13 00:04:22 -08:00
Treehugger Robot
34e4b2c3ab Merge changes from topic "services_stub"
* changes:
  Add android.annotation.Hide
  Add filegroups for services.* libraries
2019-12-13 06:18:39 +00:00
Tony Mak
642c22b223 Put userId at the end of parcel
userId is a new field added in ag/8350816, and it is written in between
some old fields when we parcelize it.

That breaks AiAi because some of its code rely on the implementation
details of SelectionEvent.writeToParcel.

In the long run, we may want to update AiAi such that it works
without this assumption, but before that, let's fix that in platform
for now.

Bug: 145962464
Bug: 123232892

Test: atest FrameworksCoreTests:android.view.textclassifier.SelectionEventTest

Merged-In: I98137a095cddf0fb4c600e1e09eef507bb750528
Change-Id: I66f65ac4c81ca964f710404fd081496355276435
2019-12-13 02:47:21 +00:00
Automerger Merge Worker
69b7d95299 Merge changes from topic "cellbroadcastintents" am: 6bcc4db8c0 am: e0c19be377
Change-Id: I04714fdbe41eeaeb845d7adfb2228a7814447d6e
2019-12-13 00:27:59 +00:00
Automerger Merge Worker
48ca7bd220 Add API to send background intent am: d0f439c43b am: 10373f032e
Change-Id: Ic2a496c962ccc2ad2475427adab6dc8dbbf2087c
2019-12-13 00:27:45 +00:00
Jordan Liu
e0c19be377 Merge changes from topic "cellbroadcastintents"
am: 6bcc4db8c0

Change-Id: Idd0a6a63731f996573f51e3343c3165d692d1adc
2019-12-12 16:02:56 -08:00
Jordan Liu
10373f032e Add API to send background intent
am: d0f439c43b

Change-Id: I82352ac4247dc785efef4c006a440d56e514f575
2019-12-12 16:02:48 -08:00
Jordan Liu
6bcc4db8c0 Merge changes from topic "cellbroadcastintents"
* changes:
  Do not modify passed in intent
  Add API to send background intent
2019-12-12 23:40:13 +00:00
Automerger Merge Worker
2c8f4df701 Merge "Deprecate incorrect year constant" am: 9fbb152eb2 am: 2b446998a1
Change-Id: I26f759d358c273657f0a0eba180968463e46ac44
2019-12-12 23:39:47 +00:00
Charles Munger
2b446998a1 Merge "Deprecate incorrect year constant"
am: 9fbb152eb2

Change-Id: I5623253402d980b8c105b4fa7a4d622067eaa7fa
2019-12-12 15:02:01 -08:00
Treehugger Robot
9fbb152eb2 Merge "Deprecate incorrect year constant" 2019-12-12 22:56:13 +00:00
Jordan Liu
3fd1264acb Do not modify passed in intent
If the caller wanted to use that intent object after passing it to this
method, it would be mutated in an unexpected way. Instead we create a
copy of the intent and broadcast that.

Bug: 144108192
Test: atest com.android.internal.telephony.CellBroadcastIntentsTest
Change-Id: I89e08b4a50beeb49410521baa9d449b2dc28ecd3
Merged-In: I89e08b4a50beeb49410521baa9d449b2dc28ecd3
2019-12-12 14:06:59 -08:00
Automerger Merge Worker
e06f253e8c Merge "Fix nav bar leak in SystemUI" into qt-qpr1-dev am: d6e73ec8f1
Change-Id: I39643a2f6e7edc9af7221a295eb201cda3244534
2019-12-12 21:47:54 +00:00
Automerger Merge Worker
7daf421abd Merge "Resolve BluetoothDevice hidden API usages by Settings" am: ce656f7754 am: 10fd57e659
Change-Id: I001128eba5499a0a080707d00c1627335eae7514
2019-12-12 21:33:56 +00:00
Winson Chung
d6e73ec8f1 Merge "Fix nav bar leak in SystemUI" into qt-qpr1-dev 2019-12-12 21:27:08 +00:00
Rahul Sabnis
10fd57e659 Merge "Resolve BluetoothDevice hidden API usages by Settings"
am: ce656f7754

Change-Id: I6c9af91fa6338246a872318038dad699c5c3fe04
2019-12-12 13:19:41 -08:00
Treehugger Robot
ce656f7754 Merge "Resolve BluetoothDevice hidden API usages by Settings" 2019-12-12 21:13:46 +00:00