Commit Graph

5928 Commits

Author SHA1 Message Date
Mohamed Abdalkader
7333793eaa Merge "Unhide ImsCallProfileConstructor." into pi-dev 2018-03-12 19:54:40 +00:00
Tyler Gunn
dd72cb529f Merge "Support enhanced call blocking function" into pi-dev 2018-03-12 15:16:04 +00:00
Pengquan Meng
847734cc67 Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into oc-dev am: fe6a5c4675 am: 5eb85f01d2
am: 037206683b

Change-Id: If981740986af74936a82d496eab591d8009e3613
2018-03-10 01:14:11 +00:00
Pengquan Meng
037206683b Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into oc-dev am: fe6a5c4675
am: 5eb85f01d2

Change-Id: Iaf8ea26f3739a5c62ce6bb402ae8161ef99b5f80
2018-03-10 00:44:41 +00:00
Pengquan Meng
5eb85f01d2 Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into oc-dev
am: fe6a5c4675

Change-Id: I4440e9b50e975ea3a20ecd216b83deb83afe2780
2018-03-10 00:20:21 +00:00
Tyler Gunn
48c570b09f Support enhanced call blocking function
- Add new carrier config to determine whether to enable
enhanced call blocking feature.
- Add new I/F to get/set the call blocking enabled status.
- Add new API to support checking whether a number is
block number with specific extras.

Bug: 28189985
Test: Manual
Merged-In: Ic89223cd31a4a8f3552360565b772315ec271902
Change-Id: Ic89223cd31a4a8f3552360565b772315ec271902
(cherry picked from commit 72e05c0382)
2018-03-09 20:44:44 +00:00
Ying Xu
3cec8d5336 Merge changes I64009362,I8ebb617c into pi-dev
* changes:
  Do not throw RuntimeException from stopScan().
  Address the API review comments.
2018-03-09 17:44:09 +00:00
Chen Xu
85c0e8787d Merge "Remove RuntimeException throws from TelephonyManager" into pi-dev 2018-03-09 17:02:41 +00:00
Android Build Merger (Role)
90000baf89 [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0 am: 3276de21ea am: bd60a681bf am: 5d5e5ca7cb am: f64ab1e93d
Change-Id: I8fc1082b7c6c64cf105246fe374260f72e83a7a8
2018-03-09 04:19:32 +00:00
Android Build Merger (Role)
f64ab1e93d [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0 am: 3276de21ea am: bd60a681bf am: 5d5e5ca7cb
Change-Id: I3bd9d6f3d290ae125d57a4650b41b8ff6cbb5591
2018-03-09 04:19:26 +00:00
Android Build Merger (Role)
bd60a681bf [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0 am: 3276de21ea
Change-Id: Ic702e9da64dc5aa8e66db22d72f070140c40bdf6
2018-03-09 04:19:16 +00:00
Android Build Merger (Role)
3276de21ea [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0
Change-Id: I9206a21355732e408430ceae77d3095793a04072
2018-03-09 04:19:11 +00:00
Android Build Merger (Role)
a61fe8f6c0 [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111
Change-Id: I96567f3adabce5207b07f71ac3b8fe60944a83f2
2018-03-09 04:19:00 +00:00
Android Build Merger (Role)
3b356d5111 [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734
Change-Id: I03d75f7b837fdeafabcf64a8d56e1b1f7af89050
2018-03-09 04:18:55 +00:00
Android Build Merger (Role)
a007cb0734 [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb
Change-Id: Ibdad47ba4b4f48341957f1112cf26794ef3af0ac
2018-03-09 04:18:50 +00:00
Android Build Merger (Role)
61f84448eb [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728
Change-Id: Ic9cf5392057bfb47945e9a1b06abb19697468610
2018-03-09 04:18:45 +00:00
Pengquan Meng
8c55a70728 Fixed Security Vulnerability of DcParamObject
The writeToParcel and readFromParcel is not symmetry, fixed it.

Test: no test
Bug: 70721937
Change-Id: I01f6f6b2ab778ee8b638d9b69fe0a6b9aa7ee395
2018-03-09 04:18:36 +00:00
Mohamed Abdalkader
4afdae952e Unhide ImsCallProfileConstructor.
- Unhide ImsCallProfileConstructor.
- instead of unhiding mMediaProfile added a setter simillar to other
fields.
- Unhide ImsMediaProfile constructor to be able to use it in
ImsCallProfileConstructor.

Test: manual
Bug:74391594
Change-Id: I591e357040d254c3f7225748dc53b66aa820f9c4
2018-03-08 21:55:33 +00:00
fionaxu
f5c0da3dec Remove RuntimeException throws from TelephonyManager
scrub exceptions from remote or due to phone service not ready.
This is in consistent with other APIs in TelephonyManager.

TODO: investigate appropriate way to handle exceptions in synchronous
APIs e.g. checked exception for those internal service failure.
tracked by b/74401420

Bug: 74016743
Test: Build
Change-Id: Ie1a07f57c2e3a70e5ac6c3ffa238c2209b34f2b8
2018-03-08 13:40:19 -08:00
yinxu
70c5286f98 Do not throw RuntimeException from stopScan().
This is a clean cherry-pick from
https://android-review.googlesource.com/#/c/platform/frameworks/base/+/635589/

Bug:73750871
Test: Unit Test
Change-Id: I640093627c103fe1d2fe5707e6854ba748789919
Merged-in: I640093627c103fe1d2fe5707e6854ba748789919
(cherry picked from commit 5e366e31ae)
2018-03-08 13:32:25 -08:00
takeshi tanigawa
67bbf70022 Initialize mWcdmaRscpAsu and fix invalid value for asu
Initialize mWcdmaRscpAsu in the constructor.
Update an invalid value of asu from -1 to 255.

Test: auto - Passed SignalStrengthTest
Bug: 71329173
Change-Id: Ic6c03fa3c405377b23159038a1e23a45ba87239c
Merged-In: Ic6c03fa3c405377b23159038a1e23a45ba87239c
2018-03-07 16:21:40 -08:00
Nathan Harold
1a1dc60ff5 Merge changes from topics "pick-tdscdma", "wcdma-rscp" into pi-dev
* changes:
  Update SignalStrength to use ASU for TD-SDCMA
  Customize the WCDMA signal strength based on RSCP
2018-03-07 19:22:32 +00:00
yinxu
8aac40520b Address the API review comments.
This is a clean cherry-pick from:
https://android-review.git.corp.google.com/c/platform/frameworks/base/+/632313

Bug:73750871
Test: Unit Test
Change-Id: I8ebb617c819c7604957b3c086098ef5074d70f78
Merged-in: I8ebb617c819c7604957b3c086098ef5074d70f78
(cherry picked from commit 1abe9b187c)
2018-03-07 09:50:55 -08:00
Nathan Harold
7fa886db6a Update SignalStrength to use ASU for TD-SDCMA
The HAL for Radio 1.2 uses -TD-SDCMA rather than
ASU RSCP for the signal strength for TD-SCDMA. This
change updates the HAL to use the new ASU-range
input.

Bug: 74202653
Test: runtest frameworks-telephony
Change-Id: Iab37ca19daf12179933cef580f248c3ef8258b98
Merged-In: Iab37ca19daf12179933cef580f248c3ef8258b98
(cherry picked from commit 31135514ec)
2018-03-06 12:11:57 -08:00
Tomita, Ryounosuke X
d41feee9ce Customize the WCDMA signal strength based on RSCP
Determines the the display level of WCDMA signal bar based on RSCP
according to carrier config.

Test: manual - Checked that the WCDMA signal bar thresholds can be
controlled by carrier config.
Test: auto - Passed SignalStrengthTest and ServiceStateTrackerTest
Bug: 71329173
Merged-In: Ib9e1c29fbe3553d1cc6695953be1c33daf260627
Change-Id: Ib9e1c29fbe3553d1cc6695953be1c33daf260627
(cherry picked from commit cbbc3424136bf75ef666d87bef1cea36f83600bf)
2018-03-06 12:11:27 -08:00
fionaxu
62bc747275 API review: rename CarrierIdentification to Carrier id
Bug: 73953797
Test: unit test
Change-Id: Id89c9100e8963a3cb890ebec347e4aabcd5fd4b8
(cherry picked from commit 4281d0ff57)
Merged-in: Id89c9100e8963a3cb890ebec347e4aabcd5fd4b8
2018-03-05 15:50:34 -08:00
Masaho Nishikawa
261f469a4f Merge "Add config to show an alert dialog for video charges" am: 1451124f86 am: 2c773d3f96
am: 513044b23a

Change-Id: I94af04cf0fca1dbcb6bb66cddcd473df22790f5f
2018-03-03 07:28:54 +00:00
Masaho Nishikawa
513044b23a Merge "Add config to show an alert dialog for video charges" am: 1451124f86
am: 2c773d3f96

Change-Id: If13158f209eda968f0fd50787679c957a3e5ea96
2018-03-03 06:51:01 +00:00
nharold
db999ba5f8 Merge changes from topics "cdma-null-island", "cdma-signal-strength" am: d5ba391425 am: 78f2c228d1
am: 062e101ffa

Change-Id: I4b31899f32b80062440b8d695fb668191924aee7
2018-03-03 05:29:00 +00:00
nharold
062e101ffa Merge changes from topics "cdma-null-island", "cdma-signal-strength" am: d5ba391425
am: 78f2c228d1

Change-Id: I4b821915c69aedd594747520186b2fb123d34b78
2018-03-03 05:13:16 +00:00
Treehugger Robot
1451124f86 Merge "Add config to show an alert dialog for video charges" 2018-03-03 03:30:19 +00:00
nharold
d5ba391425 Merge changes from topics "cdma-null-island", "cdma-signal-strength"
* changes:
  Set CDMA Location to Invalid if on Null Island
  Fix Range-Checking in CellSignalStrengthCdma
  Fix CDMA Range Checks for SignalStrength
2018-03-03 03:14:22 +00:00
nharold
082cfca292 Merge "Expose Carrier Name Override CarrierConfig Values" am: a60e42cc2d am: f0b3b84a13
am: 5bc9756f8b

Change-Id: I747e769a5d278e90fa880d9d26011c6d010fd95d
2018-03-03 02:57:41 +00:00
nharold
5bc9756f8b Merge "Expose Carrier Name Override CarrierConfig Values" am: a60e42cc2d
am: f0b3b84a13

Change-Id: I074b386070118f8cac6efe3100ae88c378fd1a5e
2018-03-03 02:49:41 +00:00
Cassie Han
b87a7a749c Merge "Expand use of 'Str' suffix in CellIdentity to 'String'" am: d622eacb9e am: 3bcb6da703
am: d210655d48

Change-Id: Ibc0862fb7ae1063cbee10415c4c21d7d4a835c51
2018-03-03 00:31:34 +00:00
Cassie Han
d210655d48 Merge "Expand use of 'Str' suffix in CellIdentity to 'String'" am: d622eacb9e
am: 3bcb6da703

Change-Id: If07c5a8d84933e8a353a77b39a1aa76f4a51a5bf
2018-03-03 00:15:26 +00:00
nharold
a60e42cc2d Merge "Expose Carrier Name Override CarrierConfig Values" 2018-03-03 00:11:29 +00:00
Holly Jiuyu Sun
5f01f42723 Merge "Add result code for eUICC card not found." am: 45277c7aca
am: 32c5a97aec

Change-Id: I43b81392646b3f2463a3df37eecbf4ffa7a653d0
2018-03-02 23:51:17 +00:00
Cassie Han
d622eacb9e Merge "Expand use of 'Str' suffix in CellIdentity to 'String'" 2018-03-02 22:15:56 +00:00
Holly Jiuyu Sun
45277c7aca Merge "Add result code for eUICC card not found." 2018-03-02 19:01:41 +00:00
Nathan Harold
8366bcb8b8 Expose Carrier Name Override CarrierConfig Values
These CarrierConfig values are needed for a
CC app to override the SPN dynamically. Since
Carrier names are very complicated, it's extra
important that these values be exposed so that we
can properly enforce correct behavior through CTS.

Bug: 73734601
Test: compilation (no functional change)
Change-Id: I26dab1bd32d1d5273f707a37026cffca7fd639a3
2018-03-01 19:10:28 -08:00
Hall Liu
5395a3cec7 Merge "Remove cell info from legacy apps without location on" am: 6b0e7370e2 am: 1c1b58432b
am: 85f47b72b8

Change-Id: I4bb4fcb6549772ced86030d0ed8cdc3d0ef0eacc
2018-03-02 02:43:46 +00:00
Hall Liu
85f47b72b8 Merge "Remove cell info from legacy apps without location on" am: 6b0e7370e2
am: 1c1b58432b

Change-Id: I0b6e2889788123f7b73de697098f44e324587477
2018-03-02 02:29:06 +00:00
Hall Liu
6b0e7370e2 Merge "Remove cell info from legacy apps without location on" 2018-03-02 00:49:33 +00:00
Jack Yu
1b7ce444f2 Merge "Added indication update mode support" am: 03664c94ae
am: 3ab2a5bced

Change-Id: I82fc7c5e7b439dd202c48dddbb1e788612aa613c
2018-03-01 21:34:24 +00:00
Holly Jiuyu Sun
e902719b93 Add result code for eUICC card not found.
Bug: 38206971
Test: test on phone
Merged-In: Ia783fe68389d950b664ad312d98c7e3aa200b471
Change-Id: Ia783fe68389d950b664ad312d98c7e3aa200b471
2018-03-01 13:00:30 -08:00
Masaho Nishikawa
4c7511caaf Add config to show an alert dialog for video charges
Add config to show an alert dialog for video charges when user starts
a video call. The default value is false.

Test: manual - Verified that a warning dialog about charges when a
video call is started if KEY_SHOW_VIDEO_CALL_CHARGES_ALERT_DIALOG_BOOL
is true.

Bug: 67832837
Test: manual
Change-Id: I11ab3ea9a8971a9d76b47714638f1fe0a9c980c2
2018-03-01 12:14:57 -08:00
Jack Yu
03664c94ae Merge "Added indication update mode support" 2018-03-01 20:04:29 +00:00
Jiuyu Sun
595182423f Merge "Add result code for eUICC card not found." 2018-03-01 19:21:32 +00:00
Jack Yu
7ae19636ca Added indication update mode support
Adde the indication update mode support so that a system
component can control the behavior of indication update. This
will be used by the bluetooth stack when some BT devices such like
carkit is connected, modem will continue update the signal strength
even when the screen is off.

Test: Manual
Bug: 65112388
Merged-In: I4bb4894eaaba401f655e5dc25138275f5e8498e1
Change-Id: I4bb4894eaaba401f655e5dc25138275f5e8498e1
(cherry picked from commit 1a1c35750b)
2018-03-01 10:37:43 -08:00