Automerger Merge Worker
f47a64b59d
Merge "[Telephony Mainline] Expose MAX_NETWORK_TYPE constant" am: 23019528ec am: a4c3162339
...
Change-Id: I263fbd69be70ccf48b0e16d00985e716060f6bfa
2019-12-17 19:20:16 +00:00
Peter Wang
a4c3162339
Merge "[Telephony Mainline] Expose MAX_NETWORK_TYPE constant"
...
am: 23019528ec
2019-12-17 11:15:51 -08:00
Peter Wang
23019528ec
Merge "[Telephony Mainline] Expose MAX_NETWORK_TYPE constant"
2019-12-17 19:10:24 +00: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
Automerger Merge Worker
51e9a965a6
Merge "Resolve BluetoothA2dpSink APIs used by Settings" am: f14e2e1e1a am: 03942aba3b
...
Change-Id: Ibfc816fcdf1400d72dc00f14096d58c92e129485
2019-12-17 03:21:25 +00:00
Betty Chang
fe520a7567
Merge "[Telephony Mainline] Add SimInfo.CONTENT_URI instead SubscriptionManager.CONTENT_URI for mainline"
...
am: e74c1f1278
2019-12-16 19:10:15 -08:00
Rahul Sabnis
03942aba3b
Merge "Resolve BluetoothA2dpSink APIs used by Settings"
...
am: f14e2e1e1a
2019-12-16 19:07:57 -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
Treehugger Robot
f14e2e1e1a
Merge "Resolve BluetoothA2dpSink APIs used by Settings"
2019-12-17 02:31:59 +00:00
Automerger Merge Worker
92cc6eba5b
Merge "Refactor BluetoothPbap APIs used by Settings" am: a33dfe1e7b am: 7231799dbe
...
Change-Id: I6167bbc3c0cf1a725816dfb4b6ccfd0997fdc65c
2019-12-17 02:30:09 +00:00
Rahul Sabnis
7231799dbe
Merge "Refactor BluetoothPbap APIs used by Settings"
...
am: a33dfe1e7b
2019-12-16 17:57:01 -08:00
Treehugger Robot
a33dfe1e7b
Merge "Refactor BluetoothPbap APIs used by Settings"
2019-12-17 01:53:24 +00:00
Automerger Merge Worker
fb829df378
Merge "[RCS] Add IMS service into system service registry" am: 6a1d13f58e am: a962a65575
...
Change-Id: I61549d3d4da7ffdf5f2d497e52cd7a2fdd0f2c05
2019-12-17 00:10:51 +00:00
James Lin
a962a65575
Merge "[RCS] Add IMS service into system service registry"
...
am: 6a1d13f58e
2019-12-16 15:51:50 -08:00
James Lin
6a1d13f58e
Merge "[RCS] Add IMS service into system service registry"
2019-12-16 23:28:44 +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
Automerger Merge Worker
1fa842bd68
Merge "expose APIs for mainline telephony-sdk" am: 0bc81e1d23 am: 91c9100315
...
Change-Id: I4990908923e76fade72928168ae40e200ea28409
2019-12-16 21:15:46 +00:00
Chen Xu
91c9100315
Merge "expose APIs for mainline telephony-sdk"
...
am: 0bc81e1d23
2019-12-16 12:58:06 -08:00
Chen Xu
0bc81e1d23
Merge "expose APIs for mainline telephony-sdk"
2019-12-16 20:51:04 +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
Automerger Merge Worker
053c87de7d
Merge "Expose the onCarrierPrivilegedAppsChanged as SystemApi" am: 58ea8819f5 am: c825f758e5
...
Change-Id: I5758fa60f50c72fcf7b51e564e39cf5f9c821d23
2019-12-16 19:02:24 +00:00
yinxu
c825f758e5
Merge "Expose the onCarrierPrivilegedAppsChanged as SystemApi"
...
am: 58ea8819f5
2019-12-16 10:47:57 -08:00
Treehugger Robot
58ea8819f5
Merge "Expose the onCarrierPrivilegedAppsChanged as SystemApi"
2019-12-16 18:40:50 +00:00
Automerger Merge Worker
ba109b3f30
Merge "Add aurimas as the owners of the android.annotation package" am: b65218c561 am: 001cf41de5
...
Change-Id: I20477b10ec559585e876388738539096992586d0
2019-12-16 14:43:29 +00:00
Jiyong Park
001cf41de5
Merge "Add aurimas as the owners of the android.annotation package"
...
am: b65218c561
2019-12-16 06:30:28 -08:00
Treehugger Robot
b65218c561
Merge "Add aurimas as the owners of the android.annotation package"
2019-12-16 14:25:59 +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
2957a01905
Merge "Remove READ_SMS permission for ACTION_SMS_MMS_DB_CREATED"
...
am: 706ac54f75
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
Jiyong Park
da70947b3e
Add aurimas as the owners of the android.annotation package
...
Bug: N/A
Test: N/A
Change-Id: I5feb978f8390c35d87a2b8b9fb82a3f63de936f2
2019-12-16 11:38:32 +09: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
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
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
2019-12-13 22:09:00 -08:00
Jack Yu
2d5bf0b845
Merge changes I5c5c4eb3,I36712447,I5b78d449
...
am: fd5241f120
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
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
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
2019-12-13 16:02:34 -08:00
Peter Wang
2dae34155e
[Telephony Mainline] Expose MAX_NETWORK_TYPE constant
...
Test: Build
Bug: 140908357
Change-Id: I40cbcdfb8e77b3e01968d008f4359790c4264539
Merged-In: I40cbcdfb8e77b3e01968d008f4359790c4264539
2019-12-13 15:36:17 -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
Rahul Sabnis
b4d383db15
Resolve BluetoothA2dpSink APIs used by Settings
...
Bug: 146082017
Test: Manual
Change-Id: Iebae62408c490cb9091b1f4e4a5a5e32321e2700
2019-12-13 14:52:55 -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
