Commit Graph

5008 Commits

Author SHA1 Message Date
Jordan Liu
2cdc98d7a6 Merge "Add config to skip showing CF fail-to-disable dialog" am: d32138d78a am: a0df3496d3
am: 4025ccb0a1

Change-Id: Ida23475584fb0324ce12af05af422230b170b1a4
2017-10-17 21:36:11 +00:00
Jordan Liu
a0df3496d3 Merge "Add config to skip showing CF fail-to-disable dialog"
am: d32138d78a

Change-Id: I0bb3388b4f2e0243049316c3548aacf6f034ffd2
2017-10-17 21:06:58 +00:00
DongYuchen
439f16d4ad Add config to skip showing CF fail-to-disable dialog
Add config to skip showing CF fail-to-disable dialog. Because it is not
always correct to show fail-to-disable dialog. It depends on the way
of NW CF handling. The default value is set to false.

Test: manual - checked the call forwarding fail dialog was not shown
Bug: 35790386
Change-Id: I8b0e3d15736d95df8fcac205cb9a3ef2f8579988
2017-10-17 20:36:02 +09:00
Sooraj Sasindran
c788882471 Merge "Enhance network scan request" am: b9f49e671a am: d5987f9722
am: c1333187cd

Change-Id: I8a9d698e2b8be06ffa8433dbdce81e673130cde8
2017-10-17 06:29:22 +00:00
Sooraj Sasindran
d5987f9722 Merge "Enhance network scan request"
am: b9f49e671a

Change-Id: If24d4740c346761391213f94647c43cbd742444a
2017-10-17 06:11:06 +00:00
Sooraj Sasindran
b9f49e671a Merge "Enhance network scan request" 2017-10-17 06:03:31 +00:00
Hall Liu
644419ff56 Merge "Add null checks to EMBMS AIDL impls" am: 9e93a6515e am: 7bfd87f169
am: 38088cbca2

Change-Id: Ie162853f505c6cebc429805e1839227901d13276
2017-10-17 05:22:19 +00:00
Hall Liu
7bfd87f169 Merge "Add null checks to EMBMS AIDL impls"
am: 9e93a6515e

Change-Id: I888b5772fca069b638f1c2d0f803cf3863b7ff85
2017-10-16 22:44:48 +00:00
Hall Liu
9e93a6515e Merge "Add null checks to EMBMS AIDL impls" 2017-10-16 22:04:17 +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
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
Hall Liu
35496c27b8 Add null checks to EMBMS AIDL impls
Add null checks for things that the user passes in so that they don't
inadvertently cause NPEs for the middleware later on.

Change-Id: I09392a2ac9adec494fcbeeba889ce7fca6708323
Fixes: 67785040
Test: manual
2017-10-13 16:51:21 -07: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
Sooraj Sasindran
6e2226d0fb Enhance network scan request
BUG=63865942

Test: Verified by making changes in settings app to call the api
      and confirmed that the new information is delivered to vendor
      code
Merged-In: Ia17647bdedefed5230f4d113b7286d820f557e95
Change-Id: Ia17647bdedefed5230f4d113b7286d820f557e95
2017-10-13 09:25:13 -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
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
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
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
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
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
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