Commit Graph

5058 Commits

Author SHA1 Message Date
nharold
2184fb285d Merge "Remove getNetworkType() from ServiceState" am: ce1f9afb84 am: 7edf405cdd am: a550f85f84
am: ab6b2db8ed

Change-Id: I936b30270a6e40d83469fb7cc528e94e49141c64
2017-10-16 20:13:19 +00:00
nharold
ab6b2db8ed Merge "Remove getNetworkType() from ServiceState" am: ce1f9afb84 am: 7edf405cdd
am: a550f85f84

Change-Id: If5c714452e56f76bf6f9629444469fda2d45be93
2017-10-16 19:04:36 +00:00
nharold
7edf405cdd Merge "Remove getNetworkType() from ServiceState"
am: ce1f9afb84

Change-Id: I8e09f9060c7066e99428ea395743f66924443488
2017-10-16 18:41:22 +00:00
nharold
ce1f9afb84 Merge "Remove getNetworkType() from ServiceState" 2017-10-16 18:30:01 +00:00
Pankaj Kanwar
063a2f667e Merge "Add CarrierConfig for Invalid Call Forwarding number" into oc-mr1-dev am: 7c18f52452
am: 5c0982c604

Change-Id: Ib075510a7e3f7ad5fe17f7dea065f1dd42328d16
2017-10-15 06:07:33 +00:00
Pankaj Kanwar
5c0982c604 Merge "Add CarrierConfig for Invalid Call Forwarding number" into oc-mr1-dev
am: 7c18f52452

Change-Id: I12c3b3e3a0d4ad4919df5daeb07367f6197ffa93
2017-10-15 04:21:34 +00:00
Nathan Harold
03d23999d3 Remove getNetworkType() from ServiceState
This method was deprecated 4 years and 11 months ago
and set to be removed in 2013. It was replaced by
getVoiceNetworkType().

Bug: 67589287
Test: make checkbuild on goog/master
Change-Id: I5fefa755738ff2fb3f3babfcafd4dfb329314feb
2017-10-13 12:06:02 -07:00
Jordan Liu
162d10d9dc Merge "Add a new carrier config to suppress AoC indication" am: db95dff0d8 am: c04d233ac2
am: 23be5ee3de

Change-Id: I5ea5156a5ea5541826ca1c6f4060fe7ccbfa1ff5
2017-10-13 00:30:00 +00:00
Jordan Liu
c04d233ac2 Merge "Add a new carrier config to suppress AoC indication"
am: db95dff0d8

Change-Id: If86b396f87e4f9f143f7abc02b4e05478693ade0
2017-10-12 23:58:55 +00:00
Jordan Liu
db95dff0d8 Merge "Add a new carrier config to suppress AoC indication" 2017-10-12 23:42:17 +00:00
Omata Shou
29b132bff4 Add a new carrier config to suppress AoC indication
Some carriers require to suppress the AoC(Advice of Charge) indication.
This carrier config is used to disable the popup dialog which warns the
user of data charges.

Test: Passed make build
Bug: 65036581
Merged-In: Ibb8d548573c9c747c790722ee526fcd626b3fa67
Change-Id: Ibb8d548573c9c747c790722ee526fcd626b3fa67
2017-10-12 16:41:20 -07: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
TreeHugger Robot
80d3310f68 Merge "Add a new carrier config to suppress AoC indication" 2017-10-12 21:16:09 +00:00
Hall Liu
f2619d4aa9 Merge "Fix URI unparceling and clarify an error condition" into oc-mr1-dev am: adaae4cb91
am: 9822017b0f

Change-Id: I60e9bd9c0124a7844fb626747911ce8c9abb25d0
2017-10-12 01:50:39 +00:00
Hall Liu
9822017b0f Merge "Fix URI unparceling and clarify an error condition" into oc-mr1-dev
am: adaae4cb91

Change-Id: I835ccb152a32c593d25bd06d64b53b51b5717c55
2017-10-12 00:12:54 +00:00
Brad Ebinger
d1525d9767 Merge "Add new Download Error Codes" am: e9bd5449b5 am: 946ff79971 am: 014d73e287
am: bb38194a55

Change-Id: I3f1c18c3a9017c48aeba29e7344c27ba24d1a037
2017-10-11 23:43:09 +00:00
Hall Liu
1c36619f5b Merge "Fix URI unparceling and clarify an error condition"
am: 5f123e6ad6

Change-Id: Ib8023d966e01fd2acefc464d8d25ed5030cfd85b
2017-10-11 23:28:42 +00:00
Hall Liu
5f123e6ad6 Merge "Fix URI unparceling and clarify an error condition" 2017-10-11 23:04:58 +00:00
Brad Ebinger
bb38194a55 Merge "Add new Download Error Codes" am: e9bd5449b5 am: 946ff79971
am: 014d73e287

Change-Id: I7c7dc265bf5ba27b61794d114937c2c4c0816470
2017-10-11 22:56:47 +00:00
Brad Ebinger
946ff79971 Merge "Add new Download Error Codes"
am: e9bd5449b5

Change-Id: I8fa3c3dcc5104a5326a680ae186c9285a7e47358
2017-10-11 22:24:58 +00:00
Brad Ebinger
e9bd5449b5 Merge "Add new Download Error Codes" 2017-10-11 22:12:26 +00: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
Omata Shou
9766b184ac Add a new carrier config to suppress AoC indication
Some carriers require to suppress the AoC(Advice of Charge) indication.
This carrier config is used to disable the popup dialog which warns the
user of data charges.

Test: Passed make build
Bug: 65036581

Change-Id: Ibb8d548573c9c747c790722ee526fcd626b3fa67
2017-10-11 12:50:28 -07:00
Hall Liu
a094510982 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-10 19:08:24 -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
6fb5072fa8 Add new Download Error Codes
Adds new MBMS Download Session error codes to allow for
more fine grained error reporting to the client app.

Test: Manual
Change-Id: I9c2163d934835efaaa145e4c0f8a91838d84aa1e
2017-10-10 12:50:49 -07:00
Brad Ebinger
c51777b9b8 Merge "Require DownloadRequest#Builder to have mandatory Source URI" am: 432c2b0fb9 am: 3b6df532f3 am: 8765abcc9e
am: d0c9d44df9

Change-Id: I953f87ddf1b78d7da88d8516744abf6806572d59
2017-10-10 19:09:28 +00:00
Brad Ebinger
d0c9d44df9 Merge "Require DownloadRequest#Builder to have mandatory Source URI" am: 432c2b0fb9 am: 3b6df532f3
am: 8765abcc9e

Change-Id: I25b39008317e333d422cd32a0c6348c010ca280f
2017-10-10 18:57:23 +00:00
Brad Ebinger
3b6df532f3 Merge "Require DownloadRequest#Builder to have mandatory Source URI"
am: 432c2b0fb9

Change-Id: I3332d44105c6ce4f8d4223caad66715c4c67d52f
2017-10-10 18:39:56 +00:00
Brad Ebinger
432c2b0fb9 Merge "Require DownloadRequest#Builder to have mandatory Source URI" 2017-10-10 18:27:36 +00:00
Brad Ebinger
ea737a8e1e 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
Change-Id: I7d44e977314a57fdf063aa233bfb978b48ebf1db
2017-10-10 00:06:04 +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
6b450cdc1b Merge "Adds a filtering bitmask to DownloadStateCallback" am: 177bd65211 am: 387b90aa97 am: 6ed82dc67b
am: 548a7e607d

Change-Id: I7faf8cfe158eb1ca59bdd900bb5cb23df8406519
2017-10-03 21:35:14 +00:00
Brad Ebinger
548a7e607d Merge "Adds a filtering bitmask to DownloadStateCallback" am: 177bd65211 am: 387b90aa97
am: 6ed82dc67b

Change-Id: Iab96a457f45f759267b9a5a41df533c9988ede94
2017-10-03 21:23:01 +00:00
Brad Ebinger
387b90aa97 Merge "Adds a filtering bitmask to DownloadStateCallback"
am: 177bd65211

Change-Id: I64950a42e8079a41105d90ea6c584ca6f940a64e
2017-10-03 20:55:50 +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
Brad Ebinger
177bd65211 Merge "Adds a filtering bitmask to DownloadStateCallback" 2017-10-03 20:23:00 +00:00
Brad Ebinger
62b4cf99a9 Merge "Remove verification for DownloadReceiver when failure" am: f78beae681 am: 354eed7bac am: 91c55f189c
am: 743539acfd

Change-Id: Ibee5c51b8c30cf4b9900f1e05aab73e4fd58b84f
2017-10-03 19:27:42 +00:00
Brad Ebinger
146430cce3 Merge "Decouple Content Name Locale from Content Language Locale" am: a830e83028 am: 768b6c5e4a am: 4b76f8420f
am: 5fc881f7e7

Change-Id: I913cf540abc5abd52c05e26900c77f1123014ff8
2017-10-03 19:18:12 +00:00
Brad Ebinger
743539acfd Merge "Remove verification for DownloadReceiver when failure" am: f78beae681 am: 354eed7bac
am: 91c55f189c

Change-Id: I9ce32afc0c6e99b0a61e05a2d2b65855f054abd9
2017-10-03 19:16:08 +00:00
Brad Ebinger
5fc881f7e7 Merge "Decouple Content Name Locale from Content Language Locale" am: a830e83028 am: 768b6c5e4a
am: 4b76f8420f

Change-Id: If87094f15e3a1dfe36d37745ed3d2cf79cc441f1
2017-10-03 19:07:46 +00:00
Brad Ebinger
354eed7bac Merge "Remove verification for DownloadReceiver when failure"
am: f78beae681

Change-Id: I02bc76b2162234c2f063e3dd7f143449a091f012
2017-10-03 18:51:32 +00:00
Brad Ebinger
768b6c5e4a Merge "Decouple Content Name Locale from Content Language Locale"
am: a830e83028

Change-Id: I225e8b71f53d584e1c8a6325dc2bb57421617dc4
2017-10-03 18:45:43 +00:00
Brad Ebinger
f78beae681 Merge "Remove verification for DownloadReceiver when failure" 2017-10-03 18:32:04 +00:00
Brad Ebinger
a830e83028 Merge "Decouple Content Name Locale from Content Language Locale" 2017-10-03 18:31:49 +00:00
Brad Ebinger
c74ae34ddb 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
Change-Id: Id7f26ba3c3606c644b0ca3376df1107f5834facb
2017-10-03 09:48:51 -07:00