Commit Graph

1209 Commits

Author SHA1 Message Date
Nazanin Bakhshi
fbd7a667d1 Merge "disallow changing from multi-sim to single-sim for carrier apps"
am: 27c8f495f2

Change-Id: Iec876a398bec6fa2c61b633d7ba8e999e4742964
2019-03-06 11:24:04 -08:00
Chen Xu
fe0d62af80 Merge "fix the issue that sending wrong preferred networktype to RIL"
am: 695bbd1858

Change-Id: I25367a464940eed11028d98f27aa9dd9a1258bbc
2019-03-05 15:41:11 -08:00
chen xu
7ce366a28e Merge "add missing annotation for TelephonyManager APIs"
am: 792ce880ad

Change-Id: Ieb46456932dae085d7d2a4756619902047db40de
2019-03-05 15:29:41 -08:00
Nazanin Bakhshi
6f68acb0f5 disallow changing from multi-sim to single-sim for carrier apps
Bug: 125122645
Test: build
Change-Id: Ie422577e1f710b033ed85caed9a3e864aadff061
Merged-In: Ie422577e1f710b033ed85caed9a3e864aadff061
(cherry picked from commit 36ede9a2e6)
2019-03-05 22:34:55 +00:00
Chen Xu
695bbd1858 Merge "fix the issue that sending wrong preferred networktype to RIL" 2019-03-05 21:10:41 +00:00
chen xu
42814534d9 fix the issue that sending wrong preferred networktype to RIL
Bug: 126805258
Test: Manual
Change-Id: Ifb1fc21423a09f0d000553d4d06bafa023adc9d6
Merged-in: Ifb1fc21423a09f0d000553d4d06bafa023adc9d6
2019-03-05 21:07:02 +00:00
Treehugger Robot
792ce880ad Merge "add missing annotation for TelephonyManager APIs" 2019-03-05 19:06:30 +00:00
chen xu
5a2b45096c add missing annotation for TelephonyManager APIs
Bug: 126702627
Test: Build
Change-Id: I39cb57db7cc1105bf74eb18ecf15ddbdc6e44f0c
Merged-in: I39cb57db7cc1105bf74eb18ecf15ddbdc6e44f0c
2019-03-04 15:43:21 -08:00
Michele Berionne
fdcb15a75a Merge "Move the check on multisim support when switch configuration is done"
am: 5461b1d23f

Change-Id: Ibcd182dd24ebb5f62918e7e71d7b3f69ae845dd9
2019-03-04 13:27:02 -08:00
Michele Berionne
5461b1d23f Merge "Move the check on multisim support when switch configuration is done" 2019-03-04 21:12:06 +00:00
Alan Stokes
4514c01068 Merge "Fix javadoc HTML escaping."
am: 693e023bac

Change-Id: I038bdae560fe93b75054004e00358da7cb752ff0
2019-03-04 08:38:03 -08:00
Treehugger Robot
693e023bac Merge "Fix javadoc HTML escaping." 2019-03-04 16:22:20 +00:00
Mark Chien
2b8bbdf659 Merge "Change return value of getTetherApnRequired() to a boolean."
am: 077a04828d

Change-Id: I493559087fc5bd3ace8db52bf9e6e5cc576e843f
2019-03-02 23:05:19 -08:00
Mark Chien
077a04828d Merge "Change return value of getTetherApnRequired() to a boolean." 2019-03-03 06:53:47 +00:00
Hall Liu
87d1b7a83e Merge "API tweaks round 2"
am: 3c0a49ec48

Change-Id: I672796cc23b917efe89eb0d54a7098856221fe63
2019-03-01 16:47:39 -08:00
Chen Xu
b33299d9af Merge "add Nullable annotation to TelephonyAPIs"
am: 9ae1256396

Change-Id: I35f33b3c21d2a60e815d73885b4d9f1eb5b18192
2019-03-01 16:33:17 -08:00
Hall Liu
3c0a49ec48 Merge "API tweaks round 2" 2019-03-01 23:00:54 +00:00
Michele
f9a71e81ee Move the check on multisim support when switch configuration is done
The methods switchMultiSimConfig() and isMultisimSupported() in
TelephonyManager have different permissions. So, in order to check if
the switch operation can be performed, the check needs to be moved after
the verification of the permissions.

Bug: 124462964
Test: compilation
Change-Id: I501110d8b3fb2d26e4dfe187b52bb45dc8b5dc4b
2019-03-01 13:01:51 -08:00
chen xu
ef3d5bc27f add Nullable annotation to TelephonyAPIs
Bug: 126702627
Test: Build
Change-Id: I0fa9370840ceda70b181976fa671cd962bdfcbca
2019-03-01 18:41:24 +00:00
Hall Liu
1059cd57f0 API tweaks round 2
Add nullability annotations and change a static constant to a method
that returns a value.

Fixes: 126702861
Fixes: 126699926
Fixes: 126698717
Fixes: 126699057
Fixes: 126701443
Fixes: 126700882
Test: compiles
Change-Id: I96396eb8890b8b5148cf74447e08c31983398e47
2019-02-28 18:54:15 -08:00
Alan Stokes
a9b5b2aab0 Fix javadoc HTML escaping.
HTLM special characters ('<', '>' and '&') don't need to be escaped
inside {@code}, even though they do elsewhere in javadoc. And in fact
they shouldn't be - because if they are escaped then the escaped
version shows up verbatim in the developer docs.

See for example:
https://developer.android.com/reference/android/graphics/drawable/GradientDrawable
https://developer.android.com/reference/android/support/v13/view/inputmethod/InputConnectionCompat

This change just removes the escaping to fix the public documentation.

Test: N/A (only comment lines changed)
Change-Id: I131b3b3e26547e30cff7b67514d177c48926bb26
2019-02-28 17:42:50 +00:00
Jordan Liu
6549c55523 Merge "Update annotations for UiccCardInfo APIs"
am: c76c5529bf

Change-Id: I229d251c7f3749738d407ced2464a44b231f9bf5
2019-02-28 05:18:17 -08:00
Treehugger Robot
c76c5529bf Merge "Update annotations for UiccCardInfo APIs" 2019-02-28 13:01:02 +00:00
Jordan Liu
28911517b2 Update annotations for UiccCardInfo APIs
Fixes: 124800040
Test: no change to behavior
Change-Id: I0644eb9bac417b9a8b0fd8eaf691728ed0784527
2019-02-27 14:45:23 -08:00
Nathan Harold
e3c38f71a4 Merge "Add Documentation for ACTION_DEBUG_EVENT"
am: fd8cb59cc1

Change-Id: I35b0ed3d291ffa6847d902a26e673361ba48709d
2019-02-27 10:54:31 -08:00
Nathan Harold
fd8cb59cc1 Merge "Add Documentation for ACTION_DEBUG_EVENT" 2019-02-27 18:39:59 +00:00
Nathan Harold
b609e1cc83 Add Documentation for ACTION_DEBUG_EVENT
The debug event action lost out on the documentation
for DebugEventReporter when it migrated to TM. This
change adds documentation for ACTION_DEBUG_EVENT
EXTRA_DEBUG_EVENT_ID, and EXTRA_DEBUG_EVENT_DESCRIPTION

Bug: 126178766
Test: make offline-sdk-docs (docstring-only change)
Change-Id: I6073d8b181c1258dbd7b47e8d5a45732d619396a
2019-02-26 16:42:54 -08:00
Chen Xu
6841e3ce85 Merge "getSimLocale should return locale rather than string tag"
am: 7db49c554a

Change-Id: Ieceda5bc3321fa810a2b50e47410f1631aac7691
2019-02-25 23:18:39 -08:00
chen xu
f98efc3961 getSimLocale should return locale rather than string tag
Bug: 124767220
Test: Build
Change-Id: Ib4938652f2e6541b44894ae1a2b0cb2ea4c899be
Merged-in: I850108ce0905d16e538e46ccd4bbf92a2bcfba42
2019-02-25 18:33:08 +00:00
Xin Li
f90d07b1b3 Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master 2019-02-23 00:39:16 +00:00
Michele Berionne
862821ede5 Merge "Add checks on multisim capabilities." 2019-02-22 01:18:41 +00:00
Xin Li
b455c3a7f3 DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Bug: 120848293
Change-Id: I2f9a524f2ba552de3f62e343075cf0abf400bbae
2019-02-21 16:02:06 -08:00
Michele
c5e6e54a20 Add checks on multisim capabilities.
Rename method isMultisimCarrierRestricted to isMultisimSupported to
indicate extended scope that includes checks on the capabilities of the
hardware to support multi-SIM configuration.

Bug: 123537730
Test: Compilation, test application
Change-Id: I20860c7a25b054b8312c144544726337e09559e2
Merged-In: I20860c7a25b054b8312c144544726337e09559e2
2019-02-21 21:28:08 +00:00
Nathan Harold
a6dda25ac9 Merge "Expose the Radio HAL Version for Test Purposes" 2019-02-20 17:50:41 +00:00
Malcolm Chen
1a1689a32c Move getPhoneCount implementation back to TelephonyManager.
Moving it inside iTelephony creates problems. Some components call
getPhoneCount during initialization while iTelephony service is not
even running, which will cause phone process to crash.

Bug: 123667461
Test: manual
Change-Id: I51199eaf0bd87055c21fe61af50f4c353137d621
Merged-In: I51199eaf0bd87055c21fe61af50f4c353137d621
2019-02-20 00:49:58 +00:00
Nathan Harold
69e0ed19e1 Expose the Radio HAL Version for Test Purposes
To properly check that values are being populated by
devices supporting newer HALs, it is necessary to
avoid enforcement on devices using older HAL versions.
Exposing the HAL version for test purposes allows that.

Bug: 122834594
Test: compilation
Change-Id: Idadc2fc8dd4f7b4765af90d92b62eea3e017a843
2019-02-15 09:56:00 -08:00
Jordan Liu
b8493ac5eb Merge "Add UNINITIALIZED and rename INVALID" 2019-02-14 00:14:11 +00:00
Hall Liu
a3aae9fe4b Merge "Implement more location checks" 2019-02-13 23:21:43 +00:00
Hall Liu
ee313737e9 Implement more location checks
Make the following modifications to APIs and required permissions.
Move the following APIs from checking coarse permission to fine
permission (except for apps targeting pre-Q):
TelephonyManager.getCellLocation()
(deprecated) TelephonyManager.getNeighboringCellInfo()
TelephonyManager.getAllCellInfo()
TelephonyManager.requestCellInfoUpdate()
PhoneStateListener#onCellLocationChanged
PhoneStateListener#onCellInfoChanged

Start checking for fine permission on the following APIs:
(Note -- these will only be logged, not denied until a future CL)
TelephonyManager.requestNetworkScan()
TelephonyScanManager.requestNetworkScan()
NetworkScanCallback#onResults

Start checking for coarse permission on the following APIs:
(Note -- these will only be logged, not denied until a future CL)
TelephonyManager#getAvailableNetworks
TelephonyManager#getServiceStateForSubscriber and #getServiceState
PhoneStateListener#onServiceStateChanged

Bug: 116258458
Test: manual via testapps
Change-Id: I45326ddacbcf538da50ca544d67eed12cf0c0861
2019-02-13 11:07:37 -08:00
Jordan Liu
1f85a3ddf3 Add UNINITIALIZED and rename INVALID
UNINITIALIZED_CARD_ID is for before the card ID is ready.
INVALID_CARD_ID is renamed to UNSUPPORTED_CARD_ID and it is used if the
card ID is known to be unsupported.

Bug: 122978614
Test: atest UiccControllerTest
Change-Id: Ia2315d9b38ef35b30d9b96b6436c08fa4404e4df
Merged-In: Ia2315d9b38ef35b30d9b96b6436c08fa4404e4df
2019-02-13 09:54:30 -08:00
Pengquan Meng
0c44939a95 Add getSlotsMapping to TelephonyManager
Bug: 123101769
Test: build
Merged-In: I416d741947b1a15e66ebf71b8104c4b2ec95e310
Change-Id: I416d741947b1a15e66ebf71b8104c4b2ec95e310
(cherry picked from commit 83e7b920de)
2019-02-12 16:24:22 -08:00
chen xu
fdeb60bd74 Address API feedbacks for networktypebitmask
1. change networktypebitmask from int to long
2. right shift definition by 1 for each bitmask, in consistent with
NW bitmask used in APN settings
3. add missing definition for IWLAN

Bug: 119118373
Test: atest CtsTelephonyTestCases:TelephonyManagerTest#testGetRadioAccessFamily
Change-Id: Idf0f88225c20fc0ed10ae4fccb705f988a3bec60
(cherry picked from commit 75b486e4c8)
Merged-in: Idf0f88225c20fc0ed10ae4fccb705f988a3bec60
2019-02-12 19:13:09 +00:00
Pengquan Meng
0beb397fa5 Merge "Add get/set PreferredNetworkTypeBitmap" 2019-02-12 03:08:57 +00:00
Nazanin Bakhshi
0e3e93a07c Make isRebootRequiredForModemConfigChange SystemApi
Bug: 124074656
Test: build
Change-Id: I32c6b0786d32b05d690cea862e977e6a2b756c90
2019-02-11 10:37:45 -08:00
Nathan Harold
f199334e3e Merge "Update CellInfo Documentation on Updates" 2019-02-08 01:24:22 +00:00
Pengquan Meng
7f62bcde3d Add get/set PreferredNetworkTypeBitmap
Bug: 111453000
Test: build
Merged-In: Icbd3b2108ce8eb75e863dcf38fb8249c1e37ea91
Change-Id: Icbd3b2108ce8eb75e863dcf38fb8249c1e37ea91
2019-02-06 23:20:14 -08:00
Nathan Harold
ef4110074e Merge "Add a Telephony Debug Surface" 2019-02-05 17:59:14 +00:00
Sooraj Sasindran
17ed973b1b Merge "Allow Privileged apps to read prefered data state" 2019-02-05 02:53:14 +00:00
Sooraj Sasindran
96b977f796 Allow Privileged apps to read prefered data state
Allow Privileged apps to read prefered data state
Change ArrayList to List for public API

Bug: 122900079
Bug: 123697660
Test: verified manually
Change-Id: Ib1221a65edf554b700088d68505da137ccd7de5e
2019-02-04 16:25:59 -08:00
Nathan Harold
1aee57aaf1 Update CellInfo Documentation on Updates
-Clarify that updates to CellInfo are not guaranteed
 regardless of SDK level.
-Suggest that callers use getTimeStamp() to see how
 old/new the cached CellInfo data is.

Bug: 122617476
Test: make offline-sdk-docs (docstring only change)
Change-Id: Ie9f3597ab2ba027179ce3c37cfeb551e8f659886
2019-02-04 14:54:51 -08:00