Commit Graph

5946 Commits

Author SHA1 Message Date
Eric Schwarzenbach
8062b76f21 Merge "Add Duplex mode to ServiceState." into pi-dev 2018-03-14 21:05:43 +00:00
Hall Liu
acecfc5858 Merge "Add IntDef for MBMS download result" into pi-dev 2018-03-14 00:37:37 +00:00
Qingxi Li
d78e0451ea Merge "Add API to check extended APDU Supported" into pi-dev 2018-03-13 23:00:10 +00:00
Brad Ebinger
feb9daffff Merge "Remove unneeded notify AIDL API" into pi-dev 2018-03-13 21:26:36 +00:00
Brad Ebinger
fc1ac6c9a8 Merge "Support Dynamic ImsService Querying" into pi-dev 2018-03-13 20:53:53 +00:00
Qingxi Li
346bddee19 Add API to check extended APDU Supported
Add API UiccSlotInfo#getIsExtendedApduSupported

Bug: 68999147
Test: TreeHugger & E2E
Change-Id: Ia400a23c35332356deaa214861f6f5ffe47c8092
2018-03-13 13:41:50 -07:00
TreeHugger Robot
ed9ee780a4 Merge "Catch the RuntimeException for stopScan()" into pi-dev 2018-03-13 19:18:42 +00:00
TreeHugger Robot
f7e6b29718 Merge "Fix a bug when calling onError(int)" into pi-dev 2018-03-13 18:47:28 +00:00
Brad Ebinger
6dbe7997c2 Remove unneeded notify AIDL API
Removes the notifyImsFeatureReady
API AIDL, it is called when the callback
is set on the specific ImsFeature
interface.

Bug: 74391574
Test: Manual
Merged-In: I4762bdef59a8adec8ce41972489c65f2d180a3d4
Change-Id: I8c9cc39fa73861d7a9792709e1517d391230abfa
2018-03-13 11:33:52 -07:00
Hall Liu
86636fc1d8 Add IntDef for MBMS download result
Change-Id: Idd8434e65691fc5d08f5427add6aec1870b76619
Fixes: 74409057
Test: compiles, no functionality change
2018-03-13 11:31:37 -07:00
Brad Ebinger
9c750fe77f Support Dynamic ImsService Querying
1) Provide a "default" impl for MmTelFeature
instead of returning null.

2) Introduce a FeatureSlotPair, which maps a SIM
slot ID to a ImsFeature. This allows the ImsService
to provide which features it supports for multi-SIM
phones.

3) Pipe through ImsResolver state to help prevent IMS
operation when the ImsResolver is in the process of
figuring out feature capabilities.

Test: Telephony ImsService test app, telephony unit tests
Bug: 72642524

Merged-In: I4d7e9ba630739ade83e3242488f330ea6e73bbd7
Change-Id: Idb95f7651af200026d62e8b29eaed30bc0ebc9d3
2018-03-13 11:06:38 -07:00
TreeHugger Robot
bccb356c70 Merge "Allow carrier privileged apps to access Telephony/Subscription APIs." into pi-dev 2018-03-13 01:41:35 +00:00
yinxu
7ea1a49c0a Catch the RuntimeException for stopScan()
Some RuntimeExceptions will be thrown across the binder so we need to
catch RuntimeException even we already catch the RemoteException.

Bug:73750871
Test: Unit Test
Change-Id: Ib72e5ce0f20fbbe913b054314ed3942862c0ab95
2018-03-12 15:55:28 -07:00
Chen Xu
f78767d2f9 Merge "Carrier id api rename" into pi-dev 2018-03-12 22:49:21 +00:00
yinxu
db18cdae66 Fix a bug when calling onError(int)
The lambda expression is executed on executor, so it is possible that
the message has been updated. The correct way is to fetch the
message.arg1 and use that value in the lamda expression.

Bug:73750871
Test: Unit Test
Change-Id: Id13f5fabf7eaad6970ab66a83a17aba7f1eebfce
2018-03-12 14:07:49 -07:00
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
Eric Schwarzenbach
2c1a177902 Add Duplex mode to ServiceState.
Adds getChannelNumber() to CellIdentity.
Creates a static utility class to calculate the duplex mode from an
EARFCN.

Bug: 73728783
Test: runtest frameworks-telephony
Change-Id: I5b5c4efa7e17594ce9397cf65e129147affe96bd
Merged-In: I5b5c4efa7e17594ce9397cf65e129147affe96bd
(cherry picked from commit a483ce3bfd)
2018-03-09 13:22:30 -08: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
Jeff Davidson
3c0415aeb8 Allow carrier privileged apps to access Telephony/Subscription APIs.
-All public APIs in TelephonyManager which require READ_PHONE_STATE
will now also be documented to accept carrier privileged callers as
well. (One exception is the change callbacks in each, which will be
addressed in a separate CL).

-For SubscriptionManager, callers without READ_PHONE_STATE will now be
able to access the subscription list; however, the resulting list will
be filtered to only include subscriptions for which the caller has
carrier privileges.

-All @see references to hasCarrierPrivileges have been removed in
favor of an inline {@link}. The @see section is set apart from the
rest of the Javadoc and thus appears out of context of where it's
actually relevant; moreover, it is often placed in the middle of a
line which makes it invalid. Using {@link} inlines the reference where
it's actually relevant.

-@SuppressAutodoc is added to any public method which has a
@RequiresPermission declaration that isn't a sufficient description of
the allowed callers, i.e. for APIs which accept carrier-privileged
callers, or the default dialer app or other exceptional cases. This
ensures redundant (but incorrect) requires permission declarations
aren't autogenerated.

Bug: 70041899
Test: TreeHugger, unit tests in topic
Change-Id: Ia5cc145c19d99fe2b87e3425bb95281980edef6f
Merged-In: Ia5cc145c19d99fe2b87e3425bb95281980edef6f
(cherry picked from commit bc10ce1efe)
2018-03-09 20:27:43 +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
fionaxu
c8d483e488 Carrier id api rename
Rename getAndroidCarrierIdForSubscription to getSimCarrierId.
Drop prefix "Android" as Android is implicit everywhere.

Rename carrierName to CarrierIdName to imply correlation between
these two APIs. This also helps to differentiate from another API
getSimOperatorName.

Bug: 71584605
Test: build
Change-Id: Iba4b1c21522741b8c11836a4c39004064736b4c6
2018-03-08 15:43:28 -08: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