Commit Graph

4810 Commits

Author SHA1 Message Date
android-build-team Robot
d9fb6e1236 Merge "Fix broken check for TelephonyManager#getForbiddenPlmns" into oc-dev am: 0a7c41615e
am: 4e0dd1197a

Change-Id: I4b37bce88249278a8b829b90adf679366e417428
2018-04-30 15:39:15 -07:00
android-build-team Robot
4e0dd1197a Merge "Fix broken check for TelephonyManager#getForbiddenPlmns" into oc-dev
am: 0a7c41615e

Change-Id: I259380ed027d31c4b8292f366590f0757f540766
2018-04-30 15:29:19 -07:00
sqian
7b52a48d6b Fix broken check for TelephonyManager#getForbiddenPlmns
(backport from a fix merged in pi-dev)

Bug: 73884967
Test: Treehugger
Change-Id: I9deaae20893184cde36dcd936fe83708fa60b830
Merged-In: I0cf7920e138892fbcab71fae0eed1293f0b2e404
Merged-In: I9e3456e5f1e479b0e2b102f6c90db57cd0e977fe
2018-04-16 22:30:05 +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
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
Tyler Gunn
d29f6f12f5 Merge "Add support for notification of LTE to WIFI handover for video calls." into oc-mr1-dev 2018-01-11 19:43:12 +00:00
Ricardo Loo Foronda
f2a8aea735 docs: Added code tag to meta-data name and fixed some @see tags
Status: Ready for review.

Changes:
* Surrounded android.service.carrier.LONG_LIVED_BINDING with code tags
  in CarrierService class.
* Prefixed @see tags with # in CarrierConfigManager#KEY_FORCE_HOME_NETWORK_BOOL.
* Prefixed @see tag with class name in
  CarrierConfigManager#notifyConfigChangedForSubId.

Test: make ds-docs

Staged content:
*
https://android-dot-devsite.googleplex.com/reference/android/service/carrier/CarrierService.html
*
https://android-dot-devsite.googleplex.com/reference/android/telephony/CarrierConfigManager.html#KEY_FORCE_HOME_NETWORK_BOOL
*
https://android-dot-devsite.googleplex.com/reference/android/telephony/CarrierConfigManager.html#notifyConfigChangedForSubId(int)

Bug: 23289716
Change-Id: I3b5be3ecc45bfb83e3fe0ae9bc76dc7761557e08
2017-12-15 15:49:01 +00:00
Tyler Gunn
5ce0d3a6b5 Add support for notification of LTE to WIFI handover for video calls.
Test: Manual, added new unit tests.
Bug: 65490850
Change-Id: I7afbd2d1e783aae425ac3fe640a6e92d1600b9a5
2017-12-14 14:06:15 -08:00
Brad Ebinger
1108564313 Add CarrierConfig for Invalid Call Forwarding number
In some situations, an invalid Call Forwarding number
from a carrier's network can cause the modem to send back
invalid characters instead of a number.

This change adds a carrier config option to replace the invalid
text with "Voicemail" in the Call Forwarding settings when
it is received from the network.

Bug: 67267077
Test: Manual
Change-Id: I26f9b80487f92340d1df2cf22bb5a616edcbdebf
2017-10-12 14:47:58 -07:00
Hall Liu
fad72cb55b Fix URI unparceling and clarify an error condition
Use the proper unparceling method for lists, add a more verbose
exception for when the app fails to declare a critical piece of
metadata.

Change-Id: I29d5291d7b88476496334d268be94f7f8c08255c
Fixes: 67640653
Test: manual, with testapp
2017-10-11 14:24:34 -07:00
Brad Ebinger
74f88fe858 Merge "Require DownloadRequest#Builder to have mandatory Source URI" into oc-mr1-dev 2017-10-10 22:47:18 +00:00
Brad Ebinger
252a0c4559 Require DownloadRequest#Builder to have mandatory Source URI
This change modifies the API to require that the
DownloadRequest#Builder includes the Source URI as a mandatory,
non-null parameter.

Test: Manual, Telephony Test MBMS app
Bug: 67640102
Merged-In: I25b39008317e333d422cd32a0c6348c010ca280f
Change-Id: I7d44e977314a57fdf063aa233bfb978b48ebf1db
2017-10-10 19:55:54 +00:00
Brad Ebinger
dbe2815199 Merge "Adds a filtering bitmask to DownloadStateCallback" into oc-mr1-dev 2017-10-04 21:42:33 +00:00
Brad Ebinger
bd8d517381 Merge "Remove verification for DownloadReceiver when failure" into oc-mr1-dev 2017-10-04 19:55:34 +00:00
Brad Ebinger
dec9fda324 Adds a filtering bitmask to DownloadStateCallback
Adds the ability for an EMBMS app to specify a filtering
bitmask to DownloadStateCallback, which is used to filter
out callbacks that the EMBMS app doesn't need to listen
to.

Test: Testapps
Bug: 67112896
Merged-In: Iab96a457f45f759267b9a5a41df533c9988ede94
Change-Id: Id7f26ba3c3606c644b0ca3376df1107f5834facb
2017-10-04 17:41:28 +00:00
Brad Ebinger
e4294cd19e Remove verification for DownloadReceiver when failure
When the ACTION_DOWNLOAD_RESULT_INTERNAL intent is received
with a failure result, don't require that extras exist
in the receiver.

Test: Manual, Testapps
Bug: 67112896
Merged-In: I9ce32afc0c6e99b0a61e05a2d2b65855f054abd9
Change-Id: I9ac43a33aff88755cbc804890ce230743195f44d
2017-10-03 20:35:25 +00:00
Brad Ebinger
a722139f9c Decouple Content Name Locale from Content Language Locale
There was an assumption that content language Locale was
a 1:1 mapping with content locale name, which is not the
case. This change separates the two and provides a new
API for retreiving the set of Locales for content name.

Test: Manual
Bug: 67112896
Merged-In: If87094f15e3a1dfe36d37745ed3d2cf79cc441f1
Change-Id: I44cb527ceb77fe321500f9d5fc00f6880ee52cb7
2017-10-03 20:33:15 +00:00
Jack Yu
66420e258a Fixed that telephony registry service reference incorrectly assigned
The reference to telephony registry service was assigned
prior telephony registry service was ready. Fixed by
casting the binder every time when we use it.

Test: Manual
Bug: 65593241
Change-Id: Ib234cdfd93130f7af44ef79271b106fffb8ebad5
2017-09-22 10:04:51 -07:00
fionaxu
6e40562a73 resolve merge conflicts of 6df58d8da1 to oc-dr1-dev
Test: I solemnly swear I tested this conflict resolution.
Bug: 65113738
Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Merged-in: I445c7bce01e0bf36214f5f4f6327a0582c774dae
Change-Id: I100ef303e5e50ddac12bc2e9f1dbeb21d6b801aa
2017-09-18 17:57:45 +00:00
fionaxu
1aedcdd075 disable carrier actions on redirection by default
1. the assumption of "carrier will redirect users to their captive
    portal page when users dont have data plan" might not be true for all
    carriers. We have seem issues like carriers random redirect users when
    they still have balance left.
    2. turn this off by default and turn it on if the carrier is
    behaving correctly and agree with it.

Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Merged-in: I445c7bce01e0bf36214f5f4f6327a0582c774dae
Bug: 65113738
Test: Manual
Change-Id: I60be2de3aa227298e60ea7eb9535bad8967b1fe3
2017-09-15 00:47:48 +00:00
Hall Liu
bfc5f1c9a8 API council suggested edits, part 3
* MbmsException no longer thrown from the common methods, and the error
codes are now containined in MbmsError.
* In order to avoid ANRs while processing download-done broadcasts,
don't perform arbitrary moves when a download is done. Instead, move
into a staging directory and let the app handle it.

Bug: 30981736
Test: testapps
Change-Id: I9416f28b4f24f89af1da6f56a93ea0f0e4ea3878
2017-09-14 17:14:24 -07:00
Hall Liu
1a5b130468 Apply suggested edits to the file-download API
* Rename Manager -> Session
* Add Handler for callbacks in download flow
* Separate out registering a state callback into another method
* Rename dispose -> close, implement AutoClosable
* No more thrown MbmsExceptions
* Add sanity check for temp file root
* Remove the getNames method, replace with getNameForLocale

Bug: 30981736
Test: testapps
Change-Id: I1a2054d79c934bc4929464de4a644b6960db47e9
2017-09-14 17:04:49 -07:00
Hall Liu
a96478a9b7 Make changes to MBMS Streaming APIs per recommendations
* Rename MbmsStreamingManager -> MbmsStreamingSession
* MbmsStreamingSession now implements AutoClosable instead of using
dispose()
* No longer throw checked MbmsExceptions from any methods. All such
errors will be reported via the async callback.
* null arguments no longer accepted for Handlers
* Guarantee that no further callbacks will get enqueued after closing.

Test: run testapps
Bug: 30981736
Merged-In: I6db045053f1baa4cd4de3718865fcfe525e8a4d6
Change-Id: I85e98850759c6c7fe7b883ffffa5b1f4e362770d
2017-09-14 13:42:08 -07:00
Hall Liu
242de1bcda Unhide EMBMS download API
Make changes to the download API so that it passes the linter, remove
@hide tags.

Test: manual
Bug: 30981736
Change-Id: Ifa0d36896338b0108fbaad4b1e9b8d857a43d491
2017-09-13 14:02:44 -07:00
Hall Liu
9903558d9d Make EMBMS adjustments for 08/04
* Add a download state callback to the callback formerly for progress
* Rename EXTRA_SERVICE_INFO to EXTRA_SERVICE_ID, and specify that it
should be a String rather than a ServiceInfo
* Add documentation to clarify that the progress/state callback may be
null

Bug: 30981736
Test: manual
Change-Id: Ie1ec99868f5b09a270b500dc97abeb9f819cfa56
2017-09-13 13:19:18 -07:00
Hall Liu
3b51e07889 Prepare EMBMS apis for un-hiding
Add more documentation to places that were lacking, bring more things in
line with the API guidelines

Change-Id: I809af5534ab425ee7e1e2dc8695d5b7e649dd22d
Test: testapps
Bug: 30981736
2017-09-13 13:18:59 -07:00
Hall Liu
aee278d6d8 Merge changes from topics "embms-0728-adjustments", "embms-0721-adjustments", "fix-streaming-api", "mock-unhide-embms-streaming" into oc-mr1-dev
* changes:
  Embms adjustments for 7/28
  Embms API adjustments for 7/21
  Fix lint errors in the streaming API
  Mock-un-hide the MBMS streaming APIs
2017-09-08 21:39:29 +00:00
Tyler Gunn
e3cf5cda13 Merge "Ensure *# are included in TTS spans generated with PhoneNumberUtils." into oc-mr1-dev 2017-09-07 15:14:44 +00:00
fionaxu
b537d740c1 disable carrier actions on redirection part 2
DO NOT MERGE handle the corner case: user on new pixel device update from O-DR to
O-MR when they are in captive portal scenario. In this scenrio,
we enabled captiveportalLoginActivity has the default url handler. this
will be persist and reset on sim absent/sim load/network avail.
On my previous fix, I removed all the signals which means after OTA
we won't reset this part. We should leave the reset signal to ensure
no carrier actions applied. even if something abnormal happens, we can
recover gracefully from reboot.

Bug: 65113738
Test: Manual
Change-Id: I445c7bce01e0bf36214f5f4f6327a0582c774dae
2017-09-06 14:55:35 -07:00
TreeHugger Robot
5bed401148 Merge "disable carrier actions on redirection by default" into oc-mr1-dev 2017-09-06 04:01:43 +00:00
Xiangyu/Malcolm Chen
aa4c059da1 Merge "Add EVENT_ROAMING_SETTING_CHANGE in DctConstants." into oc-mr1-dev 2017-09-06 01:09:35 +00:00
Tyler Gunn
c78a615dc0 Ensure *# are included in TTS spans generated with PhoneNumberUtils.
PhoneNumber utils has a method, createTtsSpan, which creates a span
for talkback to speak a phone number.  Due to a bug in Talkback it used
to strip out * and # characters.

Removing this limitation as the bug in talkback has been fixed.

Test: Manual, added unit tests
Bug: 63613215
Change-Id: I983a98a18830e32760602723e695f11e3eab9ffe
2017-09-05 14:28:47 -07:00
fionaxu
204777011d disable carrier actions on redirection by default
1. the assumption of "carrier will redirect users to their captive
portal page when users dont have data plan" might not be true for all
carriers. We have seem issues like carriers random redirect users when
they still have balance left.
2. turn this off by default and turn it on if the carrier is
behaving correctly and agree with it.

Bug: 65113738
Test: Manual
Change-Id: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
2017-09-05 14:15:04 -07:00
Hall Liu
25bdb2c8cc Embms adjustments for 7/28
* Move some vendor intents and extras into a VendorIntents class
* Add a download result RESULT_IO_ERROR
* Add documentation noting that repeated calls to
setTempFileRootDirectory will not throw an error if the parameter is the
same.
* Add getTempFileRootDirectory method for app
* Hide AIDL classes from the public/system API surfaces for download
* Remove size and md5hash from FileInfo

Test: testapps
Bug: 30981736
Change-Id: I8c968a7d68db2588ee550167ed2693fe89c5925a
2017-08-31 11:10:07 -07:00
Tyler Gunn
e0f1f26d87 Merge "De-couple data enabled from VT settings." into oc-mr1-dev 2017-08-31 15:13:08 +00:00
Hall Liu
1407bdd635 Merge "Make slight API and doc adjustments" into oc-mr1-dev 2017-08-30 20:41:53 +00:00
Brad Ebinger
ed6e29f292 Merge "Adds ERROR state to ImsConfig" into oc-mr1-dev 2017-08-30 18:31:43 +00:00
Tyler Gunn
0240dc99db Merge "Handle alternate status values." into oc-mr1-dev 2017-08-29 21:06:20 +00:00
Malcolm Chen
b0d99e435b Add EVENT_ROAMING_SETTING_CHANGE in DctConstants.
Bug: 64746542
Test: Manual
Change-Id: I91a0cb078e40b5491085a39de7c551065c00da30
2017-08-29 20:56:58 +00:00
Hall Liu
0bd7a6058c Embms API adjustments for 7/21
* Enforce that only one instance of each manager can be active.
* Add a death receipient for both managers to notify the app of binder
death
* Add documentation informing the app that it may not call create()
multiple times
* Fix a collision in streaming state reason codes
* Add documentation in DownloadRequest to indicate which methods should
be called by the middleware.

Bug: 30981736
Test: testapps
Change-Id: Ie15283b5c34fee736e8023dbd4f889c2ca95299e
2017-08-29 13:49:13 -07:00
Hall Liu
4f306dedc5 Fix lint errors in the streaming API
Fix the errors that cropped up when trying to upload the unhide CL in
MR1.

Bug: 30981736
Test: manual, with testapps
Change-Id: If4a9a5533a235a8cc56762ab7a9e32ec89440f1d
2017-08-29 11:10:14 -07:00