Michele
61f098ecaf
Expose APIs required by CarrierDefaultApp as system APIs.
...
Test: compilation
Bug: 140580265
Change-Id: I3c678522e70b5d89a6a5a8f6bdb1e3fd91ca8aee
2019-10-15 09:34:26 -07:00
Brad Ebinger
35919d5807
Merge "Fix annotations in ImsSmsImplBase" am: 90f4c2abe4 am: f9f5ebd9ca am: 0b37c14f40
...
am: 5525fd1924
2019-10-11 11:34:46 -07:00
Brad Ebinger
5525fd1924
Merge "Fix annotations in ImsSmsImplBase" am: 90f4c2abe4 am: f9f5ebd9ca
...
am: 0b37c14f40
2019-10-11 11:27:38 -07:00
Brad Ebinger
f9f5ebd9ca
Merge "Fix annotations in ImsSmsImplBase"
...
am: 90f4c2abe4
2019-10-11 11:11:17 -07:00
Brad Ebinger
90f4c2abe4
Merge "Fix annotations in ImsSmsImplBase"
2019-10-11 17:47:54 +00:00
Meng Wang
4a91bcffc4
Merge "Do not use hidden API ParcelableException"
2019-10-11 17:32:49 +00:00
Xiangyu/Malcolm Chen
07ec79849b
Merge "Rename and publicize getMaxPhoneCount; and deprecate getPhoneCount."
2019-10-11 02:06:47 +00:00
Jack Yu
31c8eb6d24
Merge "Fix inconsistentcy API in CellInfoNr" am: 85de0791e4 am: a2edbe577c am: 47d397e28e
...
am: e05f762b42
2019-10-10 17:51:11 -07:00
Jack Yu
e05f762b42
Merge "Fix inconsistentcy API in CellInfoNr" am: 85de0791e4 am: a2edbe577c
...
am: 47d397e28e
2019-10-10 17:38:19 -07:00
Jack Yu
a2edbe577c
Merge "Fix inconsistentcy API in CellInfoNr"
...
am: 85de0791e4
2019-10-10 17:14:15 -07:00
Jack Yu
85de0791e4
Merge "Fix inconsistentcy API in CellInfoNr"
2019-10-10 23:57:01 +00:00
Brad Ebinger
7da141d99b
Merge "Fix ImsMmTelManager docs to use annotations" am: 63df8520ff am: 773209c5d2 am: 60e141526d
...
am: 16f43495d6
2019-10-10 14:48:44 -07:00
Malcolm Chen
32f799da52
Rename and publicize getMaxPhoneCount; and deprecate getPhoneCount.
...
To have better names reflecting what getPhoneCount / getMaxPhoneCount
actually represent, we replace them with getActiveModemCount and
getSupportedModemCount. As getPhoneCount is public API, we mark
it as @Deprecated.
Bug: 141388730
Test: build
Change-Id: If086c50ae803b384691f709057bceeac2fc1d9d5
2019-10-10 14:36:35 -07:00
Brad Ebinger
16f43495d6
Merge "Fix ImsMmTelManager docs to use annotations" am: 63df8520ff am: 773209c5d2
...
am: 60e141526d
2019-10-10 14:35:18 -07:00
Brad Ebinger
773209c5d2
Merge "Fix ImsMmTelManager docs to use annotations"
...
am: 63df8520ff
2019-10-10 14:16:43 -07:00
Brad Ebinger
63df8520ff
Merge "Fix ImsMmTelManager docs to use annotations"
2019-10-10 20:56:31 +00:00
Brad Ebinger
50c7b1bedf
Fix annotations in ImsSmsImplBase
...
Bug: 141568452
Test: manual
Change-Id: Iad595b75d47dc9fd356e6362e3adbcb5815e375d
2019-10-10 13:25:03 -07:00
TreeHugger Robot
0b2114ea82
Merge "Make sure mTransmitPowerInfo is always populated"
2019-10-10 01:04:45 +00:00
TreeHugger Robot
6412f4fd2c
Merge "Move SmsApplication to telephony/common."
2019-10-09 23:36:21 +00:00
Peter Wang
95c3d10f3a
Merge "Add EuiccCardManager.ResetOption to eraseSubscriptions"
2019-10-09 22:45:11 +00:00
Jordan Liu
96c51f58db
Merge "[DO NOT MERGE] Revert "Add CellBroadcastService and related permissions"" am: 8172f45111 am: 21fedfab99
...
am: 87d2acb711
2019-10-09 15:01:32 -07:00
Jordan Liu
21fedfab99
Merge "[DO NOT MERGE] Revert "Add CellBroadcastService and related permissions""
...
am: 8172f45111
2019-10-09 14:26:12 -07:00
Yincheng Zhao
6a98a37a3c
Merge "Adding API in TelephonyManger for updating Fplmns."
2019-10-09 21:03:46 +00:00
Jordan Liu
656502be63
[DO NOT MERGE] Revert "Add CellBroadcastService and related permissions"
...
This reverts commit b59c74f302
2019-10-09 13:34:26 -07:00
Jordan Liu
33af2b8a0b
Merge "Rename DEFAULT_CARD_INDEX" am: 038d1b5b27 am: 6802dbb6d5 am: 520be09949
...
am: 87bc4f1ee7
2019-10-09 12:22:56 -07:00
Hall Liu
75ab96a83f
Merge "Fix race in TelephonyScanManager" am: 884dd0f559 am: 0c85ca1062 am: 8fd8b5b234
...
am: f67ba767a0
2019-10-09 12:16:50 -07:00
Jordan Liu
87bc4f1ee7
Merge "Rename DEFAULT_CARD_INDEX" am: 038d1b5b27 am: 6802dbb6d5
...
am: 520be09949
2019-10-09 12:12:42 -07:00
Hall Liu
f67ba767a0
Merge "Fix race in TelephonyScanManager" am: 884dd0f559 am: 0c85ca1062
...
am: 8fd8b5b234
2019-10-09 12:08:46 -07:00
zhouwenjie
df0e41042c
Make sure mTransmitPowerInfo is always populated
...
Currently mTransmitPowerInfo could be empty, which ends up with a
IndexOutOfBoundsException.
Bug: 141382585
Change-Id: I97417f539b2bfba98499cbf4b609ea7c088b808f
Test: atest CtsIncidentHostTestCases:com.android.server.cts.BatteryStatsValidationTest
2019-10-09 18:57:03 +00:00
Jordan Liu
6802dbb6d5
Merge "Rename DEFAULT_CARD_INDEX"
...
am: 038d1b5b27
2019-10-09 11:44:17 -07:00
Hall Liu
0c85ca1062
Merge "Fix race in TelephonyScanManager"
...
am: 884dd0f559
2019-10-09 11:36:41 -07:00
Treehugger Robot
038d1b5b27
Merge "Rename DEFAULT_CARD_INDEX"
2019-10-09 18:25:34 +00:00
Treehugger Robot
884dd0f559
Merge "Fix race in TelephonyScanManager"
2019-10-09 18:20:14 +00:00
Jordan Liu
cb0c6c90a9
Merge "Add CellBroadcastService and related permissions" am: 32382561a6 am: a2ca902d2f
...
am: d208c955e5
2019-10-09 09:43:10 -07:00
Jordan Liu
a2ca902d2f
Merge "Add CellBroadcastService and related permissions"
...
am: 32382561a6
2019-10-09 09:26:01 -07:00
Sarah Chin
2b4b00af6c
Merge "Add NETWORK_TYPE_NR to Telephony framework" into qt-qpr1-dev
...
am: c60e032391
2019-10-08 17:28:52 -07:00
Jordan Liu
b59c74f302
Add CellBroadcastService and related permissions
...
CellBroadcastService is bound to by the platform to handle cell
broadcasts.
Bug: 135956699
Test: manual
Change-Id: Ib1b20da03d271fc0b2736774b2ca6c6514944093
Merged-In: Ib1b20da03d271fc0b2736774b2ca6c6514944093
2019-10-08 11:20:46 -07:00
Michael Groover
3b5eb58b74
Merge "Update TelephonyManager#getNai docs for new device ID requirements"
2019-10-08 18:13:02 +00:00
Amit Mahajan
1ec2e61e7f
Move SmsApplication to telephony/common.
...
Test: basic sanity
Bug: 140763963
Change-Id: I8662c210319523abe64feaf0610af19fd285c8ca
2019-10-08 10:12:30 -07:00
TreeHugger Robot
183536f524
Merge "Move MmsManager and IMms to frameworks/base/mms"
2019-10-08 03:36:30 +00:00
TreeHugger Robot
c3737e00ba
Merge "Make isDataEnabledForApn() a system api."
2019-10-08 01:54:10 +00:00
Chen Xu
302bd23a32
Merge "move CellBroadcastMessage from telephony-common to app"
2019-10-08 01:02:48 +00:00
Amit Mahajan
6237a6b35c
Move MmsManager and IMms to frameworks/base/mms
...
Test: basic sanity
Bug: 140763963
Change-Id: Ib2cffce98f62913c3e50c59b63012c39d595d9ce
2019-10-07 17:41:26 -07:00
Peter Wang
0c1297b2d7
Add EuiccCardManager.ResetOption to eraseSubscriptions
...
Bug: 139474431
Test: on device
Change-Id: Ib8496ed6dbc6179940892de8df7901e84dd67d76
2019-10-07 17:25:18 -07:00
Amit Mahajan
505e174176
Make isDataEnabledForApn() a system api.
...
Test: atest TelephonyManagerTest#testIsDataEnabledForApn
Bug: 140763963
Change-Id: Icbb29124294972766f68533b7e23700dd491c075
2019-10-07 16:19:05 -07:00
Xiangyu/Malcolm Chen
ff3cf4315a
Merge "Add public intent ACTION_MULTI_SIM_CONFIG_CHANGED."
2019-10-07 22:53:09 +00:00
Hall Liu
418e7798ab
Fix race in TelephonyScanManager
...
TelephonyScanManager may sometimes encounter a race condition where
Telephony sends it the first scan result before it has saved the
returned scan ID. This causes a crash in the app that's requesting the
scan.
To fix this, synchronize on mScanInfo while requesting the network scan
so that the handler in TelephonyScanManager will wait for the scan ID to
be saved before processing the first message from Telephony.
Bug: 142068098
Test: manual
Change-Id: I0b2b4c6dc749e21641843818293941704ed870a6
2019-10-07 15:38:02 -07:00
Sarah Chin
06b97e2a38
Add NETWORK_TYPE_NR to Telephony framework
...
Add NETWORK_CLASS_5_G to TelephonyManager
Add NR to ServiceState
Bug: 135421985
Test: atest FrameworksTelephonyTests
Change-Id: Iaed46354400c7a1ce410eebc246892d7edf448dc
Merged-In: Iaed46354400c7a1ce410eebc246892d7edf448dc
2019-10-07 14:07:51 -07:00
Sarah Chin
1018c95696
Merge "Add NETWORK_TYPE_NR to Telephony framework"
2019-10-07 19:17:27 +00:00
Sarah Chin
080b210f0e
Add NETWORK_TYPE_NR to Telephony framework
...
Add NETWORK_CLASS_5_G to TelephonyManager
Add NR to ServiceState
Bug: 135421985
Test: atest FrameworksTelephonyTests
Change-Id: Iaed46354400c7a1ce410eebc246892d7edf448dc
2019-10-07 12:14:33 -07:00
