Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
440,733 Commits 3 Branches 0 Tags
f47a64b59dcfffdce5d1080c07a43eb78bbec53b
Commit Graph

7497 Commits

Author SHA1 Message Date
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
Automerger Merge Worker
9d3d79199b Merge "Mainline Network Policy constants public" am: 56fcc024bc am: 242454626f 
Change-Id: Id518fa8327bc2c15717d662a7f3f39cca8ec84a2
 2019-12-17 19:18:53 +00:00
Peter Wang
23019528ec Merge "[Telephony Mainline] Expose MAX_NETWORK_TYPE constant" 2019-12-17 19:10:24 +00:00
Treehugger Robot
56fcc024bc Merge "Mainline Network Policy constants public" 2019-12-17 18:59:04 +00:00
Automerger Merge Worker
e69e206ba9 Merge "Introduce Radio Shutdown System APIs for Mainline" am: c107c3a958 am: 684df48afc 
Change-Id: I74283f4f9414a3b768f2307197b5cc8987394fb2
 2019-12-17 18:39:39 +00:00
Shuo Qian
c107c3a958 Merge "Introduce Radio Shutdown System APIs for Mainline" 2019-12-17 18:17:34 +00:00
Automerger Merge Worker
f0225870a7 Merge "Change APIs related to carrier actions." am: b430d57705 am: 0ef137bb81 
Change-Id: I5b21f2461a85f1832c4b73f3f6cf7d8946e7fdb6
 2019-12-17 07:28:23 +00:00
Treehugger Robot
b430d57705 Merge "Change APIs related to carrier actions." 2019-12-17 07:06:36 +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
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
61f1ecb238 Merge "Fix for Telephony Manager API javadoc inconsistencies" am: 59b88e0e6a am: 8a13455417 
Change-Id: Iceb31e933b30363ce89a57305ad70fd5cabfa6fb
 2019-12-17 01:17:14 +00:00
Treehugger Robot
59b88e0e6a Merge "Fix for Telephony Manager API javadoc inconsistencies" 2019-12-17 00:53:08 +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
6a1d13f58e Merge "[RCS] Add IMS service into system service registry" 2019-12-16 23:28:44 +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
0bc81e1d23 Merge "expose APIs for mainline telephony-sdk" 2019-12-16 20:51:04 +00:00
Shuo Qian
3d18290b0d Mainline Network Policy constants public 
Test: Treehugger
Bug: 145759152
Change-Id: I05ab2e723d60cff9f67d89302591026c33c54e24
 2019-12-16 20:49:18 +00:00
Automerger Merge Worker
1d45b32881 Merge "Update AccessNetworkType for NR" am: 322f00e30f am: 39cf3d1de4 
Change-Id: I062b9e464d072ea19b1ef9be5d48a1a23b3889be
 2019-12-16 20:28:52 +00:00
Treehugger Robot
322f00e30f Merge "Update AccessNetworkType for NR" 2019-12-16 19:38:41 +00:00
Automerger Merge Worker
6f6509fcfe Merge "Added read phone state permission for getNetworkCountryIso" am: 8409679749 am: 17fd16a84b 
Change-Id: I982337471cbf99f9a69054fba4e58074e5799d11
 2019-12-16 17:47:45 +00:00
Jack Yu
8409679749 Merge "Added read phone state permission for getNetworkCountryIso" 2019-12-16 17:29:15 +00:00
Automerger Merge Worker
30496f4c57 Merge "Update TelephonyManager#getNai docs for new device ID requirements" am: 2cf7b94daf am: 5e2a0a3321 
Change-Id: I9372e5280310bed09b1247b42f7d2c304894a83d
 2019-12-16 10:20:34 +00:00
Treehugger Robot
2cf7b94daf Merge "Update TelephonyManager#getNai docs for new device ID requirements" 2019-12-16 09:07:50 +00:00
Automerger Merge Worker
4220c8e086 Merge "Replaced Build.IS_DEBUGGABLE" am: 81491a1265 am: 503ceb05ec 
Change-Id: Ib7cd8e99e1fe9d6c22c2b81c02b22eca464cb313
 2019-12-16 04:25:45 +00:00
Treehugger Robot
81491a1265 Merge "Replaced Build.IS_DEBUGGABLE" 2019-12-16 02:32:58 +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
c0fa362e1b Merge "remove API RoleManager.getFinancialSms" 2019-12-14 06:57:48 +00:00
Automerger Merge Worker
3e89b5faac use SmsCbMessage.MESSAGE_FORMAT_3GPP to replace hidden SmsMgr APIs am: 125e446c18 am: d65fff9418 
Change-Id: Iebb765ba462c5327e3950d5ed99978f583ca3e99
 2019-12-14 06:21:39 +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
d65fff9418 use SmsCbMessage.MESSAGE_FORMAT_3GPP to replace hidden SmsMgr APIs 
am: 125e446c18

Change-Id: If49ebee7c6bec81559641096482d82cce0515148
 2019-12-13 22:08:45 -08:00
Daniel Bright
60b37c37f0 Replaced Build.IS_DEBUGGABLE 
Changed Build.IS_DEBUGGABLE to TelephonyUtils.IS_DEBUGGABLE and
Build.IS_USER to TelephonyUtils.IS_USER.

Bug: 145952396
Test: Telephony unit tests

Change-Id: If3ca3171f8c09552642e797fb0ce2d00ccacc999
Merged-In: If3ca3171f8c09552642e797fb0ce2d00ccacc999
 2019-12-13 21:41:12 -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
Michael Groover
265bb44569 Update TelephonyManager#getNai docs for new device ID requirements 
Bug: 131188555
Test: Build
Change-Id: I99aa929ce7c734d9449fe23f6f483af4463fed19
Merged-in: I99aa929ce7c734d9449fe23f6f483af4463fed19
 2019-12-14 01:03:53 +00:00
Chen Xu
125e446c18 use SmsCbMessage.MESSAGE_FORMAT_3GPP to replace hidden SmsMgr APIs 
Bug: 135956699
Test: unit test
Change-Id: Id631875ba6639ebf4fa569696a982c49d9c93e8f
(cherry picked from commit dd79281f97)
Merged-in: Id631875ba6639ebf4fa569696a982c49d9c93e8f
 2019-12-13 16:48:29 -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
Automerger Merge Worker
8133ad5ee3 Merge "Allow addSubscriptionsIntoGroup with grouUuid that isn't assigned." am: c937749b18 am: 4643b919cd 
Change-Id: I098ea6ecf3af00503b6f82f35b1044762222b1f7
 2019-12-13 23:54:11 +00:00
Treehugger Robot
ac335868bf Merge "Remove "import JobService" to remove build time dependency" 2019-12-13 23:51:39 +00:00
Xiangyu/Malcolm Chen
c937749b18 Merge "Allow addSubscriptionsIntoGroup with grouUuid that isn't assigned." 2019-12-13 23:43:50 +00: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
5def2c6004 Throw illegal argument exception when slot index is invalid 
Test: Manual
Bug: 144097779
Merged-In: I5c5c4eb313fd42317a2b0feed0946b8e4003ad62
Change-Id: I5c5c4eb313fd42317a2b0feed0946b8e4003ad62
(cherry picked from commit 0d75aee571)
 2019-12-13 15:34:33 -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
Jack Yu
35eed63424 Improved debug message 
Printed out polygon information

Test: Manual
Merged-In: I5b78d4494418f07dd0a4340c7ef4bd1e499af536
Change-Id: I5b78d4494418f07dd0a4340c7ef4bd1e499af536
(cherry picked from commit 3b6b57b685)
 2019-12-13 15:32:11 -08:00
Jack Yu
92203589f1 Added read phone state permission for getNetworkCountryIso 
The slot based version of getNetworkCountryIso is a system API.
So it needs to be gaurded by permission.

Bug: 141646066
Test: Telephony sanity tests
Merged-In: I810ff0b77b93870ae3f62769977c7094789d0a5a
Change-Id: I810ff0b77b93870ae3f62769977c7094789d0a5a
(cherry picked from commit 105f65068c)
 2019-12-13 15:20:21 -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
Jack Yu
39424f4b70 Merge "When SPN is empty, use PNN in mobile network settings" 2019-12-13 21:55:00 +00:00
yinchengzhao
abf9e43cb0 Fix for Telephony Manager API javadoc inconsistencies 
Bug: 144455918
Test: atest TelephonyManagerTest
Change-Id: Iac372f04afe210ac7d3edc6fc880ee6a7e614945
 2019-12-13 13:54:26 -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
Automerger Merge Worker
75332fe95e Merge "Expose ACTION_EMERGENCY_ASSISTANCE as SystemAPi" am: ba4eb1d6b4 am: 68a76f5c4c 
Change-Id: I3953180c29faba0bcc14c4c3f6a56a7455ec3a47
 2019-12-13 21:47:01 +00:00