Commit Graph

5446 Commits

Author SHA1 Message Date
Eric Schwarzenbach
a36ada4b95 Merge "Add constants for reporting criteria" 2018-03-27 20:59:20 +00:00
Treehugger Robot
aa8f09d41a Merge "Split the DownloadStateCallback class into two" 2018-03-26 23:53:40 +00:00
Hall Liu
49d1cb4770 Split the DownloadStateCallback class into two
Use individually-registered DownloadStatusListener and
DownloadProgressListener instead to listen for download status and
progress, respectively.

Bug: 74409377
Test: cts
Change-Id: Ifd5289038ffd66eef8bd7916f5256205b49be5f9
Merged-In: Ifd5289038ffd66eef8bd7916f5256205b49be5f9
2018-03-26 21:45:21 +00:00
Treehugger Robot
5d9544cbea Merge "Better javadoc and rename several methods in ApnSetting." 2018-03-26 16:28:58 +00:00
yuemingw
a5b7e70eff Better javadoc and rename several methods in ApnSetting.
Cherrypicked from ag/3709855.

Test: Manually by TestDpc
Bug: 73087996
Merged-In: I5232c92a44ab505946956f81965a205f170aa52b
2018-03-26 16:28:03 +00:00
Treehugger Robot
d3e1c76a99 Merge "Change null behavior of getCellBandwidths" 2018-03-23 21:06:45 +00:00
Eric Schwarzenbach
4e93e44115 Change null behavior of getCellBandwidths
Returns empty array instead of null when there are
no cell bandwidths.

Bug: 73751023
Test: make, runtest
Change-Id: Idc3f034bbea8f6c3f11dcd125f760b121d2c91d9
Merged-In: Idc3f034bbea8f6c3f11dcd125f760b121d2c91d9
(cherry picked from commit c119a86350)
2018-03-23 12:10:09 -07:00
Eric Schwarzenbach
7ff6e14cf4 Add constants for reporting criteria
Adds RILConstants and TelephonyManager constants for reporting and
setting indication filter bits.

Bug: 72117365
Test: make
Change-Id: Ia52ffdbc9ea2499893ece518aba4a99c6fe4ee90
2018-03-23 11:21:44 -07:00
Ying Xu
ec76adb9ff Merge "Add more comments for the isConfigForIdentifiedCarrier()" 2018-03-22 19:07:45 +00:00
Pankaj Kanwar
320b6c2312 Merge "Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false"" 2018-03-22 17:03:39 +00:00
Holly Jiuyu Sun
a99b258049 Merge "Mark eraseSubscriptions as @SystemApi." 2018-03-22 03:45:55 +00:00
Pankaj Kanwar
77f2365672 Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false"
This reverts commit 84a8bb80a1.

Change-Id: Ied14258726d71262642f8d72db5ee11ea671836b
2018-03-21 20:20:06 +00:00
nharold
08ee27ff90 Merge "Add alpha Strings to CellIdentityTdscdma" 2018-03-21 20:06:59 +00:00
Treehugger Robot
e3ee136c89 Merge "Cherry-pick 'Add @Nullable annotations to getOperatorAlphaLong and getOperatorAlphaShort to CellIdentity.'" 2018-03-21 00:15:10 +00:00
Nathan Harold
a7b147eb05 Add alpha Strings to CellIdentityTdscdma
Add equivalent alphaLong and alphaShort to
TD-SCDMA so that it's equivalent to LTE, WCDMA,
GSM, etc.

Bug: 75980473
Test: compilation
Merged-In: Ibaa8a7daafb44f7fc94f0fd6aaa193b67793eea4
Change-Id: Ibaa8a7daafb44f7fc94f0fd6aaa193b67793eea4
(cherry picked from commit 0acd7eeed4)
2018-03-20 16:46:28 -07:00
Holly Jiuyu Sun
bbebf8feb4 Mark eraseSubscriptions as @SystemApi.
This is a blocker for P.

Bug: 74621500
Test: test on phone
Merged-In: I9455a0b7594cbd2acbdbba99a725c9866c448a07
Change-Id: I9455a0b7594cbd2acbdbba99a725c9866c448a07
2018-03-20 16:31:59 -07:00
Cassie
f7bb40affb Cherry-pick 'Add @Nullable annotations to getOperatorAlphaLong and
getOperatorAlphaShort to CellIdentity.'

Bug: 75984192
Test: Unit test
Change-Id: I71feb20075559c7b28d4aa346a603f0d11ca69da
Merged-In: I71feb20075559c7b28d4aa346a603f0d11ca69da
2018-03-20 21:04:09 +00:00
Jeff Davidson
1ba1839bd8 Expose remaining READ_PHONE_STATE and SEND_SMS APIs to carrier apps.
Bug: 70177947
Bug: 70041899
Test: Flash / boot; TreeHugger; Unit/CTS tests in topic
Merged-In: I4061becb1d7ceaa58d84e4e3568c1b6e63cfc8d1
Change-Id: I4061becb1d7ceaa58d84e4e3568c1b6e63cfc8d1
2018-03-19 18:48:11 -07:00
Treehugger Robot
fe78972bb2 Merge "Allow carrier-privileged apps to register telephony listeners." 2018-03-19 21:24:27 +00:00
Treehugger Robot
78a7b5d44a Merge "Add empty CdmaSmsSubaddress to CDMA PDU parsing" 2018-03-19 21:04:56 +00:00
Jack Yu
5b7103ab97 Merge "Renamed getNetworkId and getSystemId" 2018-03-16 21:50:19 +00:00
Brad Ebinger
465fdc2b25 Merge "Define phone process as a constant" 2018-03-16 18:38:30 +00:00
Brad Ebinger
22018a8ce7 Add empty CdmaSmsSubaddress to CDMA PDU parsing
We were not providing an empty subaddress when
parsing CDMA PDU, which caused an NPE when receiving
CDMA IMS SMS.

Bug: 73994015
Test: Manual, MT/MO SMS
Change-Id: I07be3ac64341eb9235f6da1b6870ac746188f73a
2018-03-16 11:34:20 -07:00
Brad Ebinger
d273dea10b Merge "Added Locking for MmTelFeature" 2018-03-16 18:21:07 +00:00
Jack Yu
46d2bc06d6 Renamed getNetworkId and getSystemId
1. Renamed getNetworkId() to getCdmaNetworkId()
2. Renamed getSystemId() to getCdmaSystemId()

Test: Build
Bug: 74976831
Merged-In: I2a5fb50a59c3239bd3dca5568991a9dff08839fc
Change-Id: I2a5fb50a59c3239bd3dca5568991a9dff08839fc
(cherry picked from commit 2661fac133)
2018-03-16 11:07:37 -07:00
Treehugger Robot
a9c0419010 Merge "Added CTS test cases for getNetworkId() and getSystemId()" 2018-03-16 17:39:38 +00:00
yinxu
cea0d8d488 Add more comments for the isConfigForIdentifiedCarrier()
Bug:74945742
Test: Compile
Change-Id: Ife3fdf797ca8877ec495d61a8aeed56fa20282a7
2018-03-16 10:16:53 -07:00
Jack Yu
260f2fa1fe Added CTS test cases for getNetworkId() and getSystemId()
Bug: 32718590
Test: atest CtsTelephonyTestCases:ServiceStateTest#testServiceState
Merged-In: I5826a59d85028f0350ee39c69553f4e488d6456b
Change-Id: I5826a59d85028f0350ee39c69553f4e488d6456b
(cherry picked from commit 1b8b38928b)
2018-03-16 00:26:33 -07:00
yinxu
2e8d5ed776 Use AsyncTask.SERIAL_EXECUTOR as the default executor for scan
Because there will be multiple callbacks for each scan and they must be
invoked with the same order as they are received by the platform, we
should use AsyncTask.SERIAL_EXECUTOR instead of
AsyncTask.THREAD_POOL_EXECUTOR as the default executor.

Bug:74840070
Test: Unit Test, CTS Test
Change-Id: I7333940dad38f7e400a4124486bdb21cea0d5220
2018-03-15 13:28:05 -07:00
Jeff Davidson
01efe5e563 Allow carrier-privileged apps to register telephony listeners.
For TelephonyManager#listen, we check carrier privileges if
READ_PHONE_STATE is missing for any calls which enforce the
permission. For calls which check it and behave differently (by
redacting sensitive info), we defer the permission check until the
actual event occurs, at which point it is checked based on the current
state of the device.

For SubscriptionManager#addOnSubscriptionsChangedListener, we remove
the existing permission check for READ_PHONE_STATE altogether. The
event itself contains no information, and reading subscriptions still
requires either READ_PHONE_STATE or carrier privileges on the
subscription in question.

Also updates incorrect Javadoc on
PhoneStateListener#LISTEN_SIGNAL_STRENGTH, which does not actually
check any permissions by design.

Bug: 70041899
Fixes: 74034127
Test: TreeHugger + E2E test w/ a carrier-privileged app
Change-Id: I84a56ad3972b9edcfdefcbb43ef174c54cdcac00
Merged-In: I84a56ad3972b9edcfdefcbb43ef174c54cdcac00
(cherry picked from commit 62b994b3cf)
2018-03-15 10:44:41 -07:00
Brad Ebinger
835a8fb230 Define phone process as a constant
Test: Manual
Bug: 72645729
Change-Id: If07728ea2cc0128113ebe947a154f80ff45a7d9d
2018-03-14 16:14:55 -07:00
Treehugger Robot
fd4385e633 Merge "Add API to check extended APDU Supported" 2018-03-14 21:59:58 +00:00
Treehugger Robot
0715570648 Merge "Catch the RuntimeException for stopScan()" 2018-03-14 19:47:44 +00:00
Treehugger Robot
d116852e69 Merge "Fix a bug when calling onError(int)" 2018-03-14 19:46:51 +00:00
yinxu
17dbd5b1f5 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.

This is a clean cherry-pick from
https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/3725360

Bug:73750871
Test: Unit Test
Change-Id: Id13f5fabf7eaad6970ab66a83a17aba7f1eebfce
Merged-in: Id13f5fabf7eaad6970ab66a83a17aba7f1eebfce
(cherry picked from commit db18cdae66)
2018-03-14 11:35:24 -07:00
yinxu
97922be2ac 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.

This is a clean cherry-pick from
https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/3725821

Bug:73750871
Test: Unit Test
Change-Id: Ib72e5ce0f20fbbe913b054314ed3942862c0ab95
Merged-in: Ib72e5ce0f20fbbe913b054314ed3942862c0ab95
(cherry picked from commit 7ea1a49c0a)
2018-03-14 11:32:09 -07:00
Tyler Gunn
c2493ee1ee Merge "Update API docs for Telephony call state reporting." 2018-03-14 14:59:52 +00:00
Qingxi Li
9ec2c8c50a Add API to check extended APDU Supported
Add API UiccSlotInfo#getIsExtendedApduSupported

Bug: 68999147
Test: TreeHugger & E2E
Change-Id: Ia400a23c35332356deaa214861f6f5ffe47c8092
Merged-In: Ia400a23c35332356deaa214861f6f5ffe47c8092
2018-03-14 01:41:45 +00:00
Treehugger Robot
985b17957a Merge "Allow carrier privileged apps to access Telephony/Subscription APIs." 2018-03-14 00:10:12 +00:00
Tyler Gunn
5f7265ec9c Update API docs for Telephony call state reporting.
Update TelephonyManager#getCallState,
PhoneStateListener#onCallStateChanged to make it clear which calls each
method considers in determining call state.
Added intdef for call state (allows auto doc generation of valid
values for parameters).

Test: make docs
Bug: 73245376
Change-Id: I70ebd0f00ae3f0e1370ae275be8f8ef6f008523d
2018-03-13 15:56:37 -07:00
Hall Liu
54b8ab7333 Merge "Add IntDef for MBMS download result" 2018-03-13 20:10:38 +00:00
Hall Liu
26440f7fa6 Add IntDef for MBMS download result
Change-Id: Idd8434e65691fc5d08f5427add6aec1870b76619
Fixes: 74409057
Test: compiles, no functionality change
2018-03-13 11:29:33 -07:00
Treehugger Robot
57479b64b7 Merge "Carrier id api rename" 2018-03-13 18:28:50 +00:00
Brad Ebinger
991f8b0c34 Merge "Remove unneeded notify AIDL API" 2018-03-13 16:31:35 +00:00
Brad Ebinger
4b10333c26 Merge "Remove IMS Emergency Calling availability API" 2018-03-13 16:30:45 +00:00
fionaxu
2a09217315 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
(cherry picked from commit c8d483e488)
Merged-in: Iba4b1c21522741b8c11836a4c39004064736b4c6
2018-03-13 04:43:15 +00:00
Jeff Davidson
e652cb1736 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-12 18:48:03 -07:00
Brad Ebinger
6fc1a2f0d4 Merge "Support Dynamic ImsService Querying" 2018-03-12 22:53:47 +00:00
Jordan Liu
fdf4dd7928 Merge "Remove getDefaultSim hidden api" 2018-03-12 21:17:43 +00:00
Brad Ebinger
05de38f298 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
Change-Id: I8c9cc39fa73861d7a9792709e1517d391230abfa
2018-03-12 11:13:26 -07:00