Commit Graph

2520 Commits

Author SHA1 Message Date
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
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
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
Brad Ebinger
d01f6eec20 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
Change-Id: I44cb527ceb77fe321500f9d5fc00f6880ee52cb7
2017-09-29 15:34:50 -07:00
Brad Ebinger
fce0c34863 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
Change-Id: I9ac43a33aff88755cbc804890ce230743195f44d
2017-09-29 11:04:05 -07:00
Jack Yu
aeb6820f11 Merge "Fixed that telephony registry service reference incorrectly assigned"
am: b0510407da

Change-Id: I0d65bc2cc843ce49a10cf6fdebfc4e1f602edaea
2017-09-26 11:33:16 +00:00
Jack Yu
630c4d1744 Merge "Fixed that telephony registry service reference incorrectly assigned" into oc-mr1-dev am: baf1201b43
am: 9e3d9686a4

Change-Id: Iacb91e0f5a8ba5ac7b7e024950bff8f9ee79491c
2017-09-25 17:40:10 +00:00
Jack Yu
9e3d9686a4 Merge "Fixed that telephony registry service reference incorrectly assigned" into oc-mr1-dev
am: baf1201b43

Change-Id: I1470e1195ac34282b0fffc6fd9d594601294cb01
2017-09-25 17:29:59 +00:00
Jack Yu
e4e5dabe8c 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
Merged-In: Ib234cdfd93130f7af44ef79271b106fffb8ebad5
Change-Id: Ib234cdfd93130f7af44ef79271b106fffb8ebad5
(cherry picked from commit 66420e258a)
2017-09-25 10:29:56 -07: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
Tyler Gunn
c7588904ba Merge "De-couple data enabled from VT settings."
am: 29fc1d78a9

Change-Id: I39c1ec07eb087830605b603dbf420bfa6a4385f2
2017-09-20 21:25:44 +00:00
Tyler Gunn
29fc1d78a9 Merge "De-couple data enabled from VT settings." 2017-09-20 20:19:30 +00:00
Tyler Gunn
0a76216448 Add Telephony connection event for call forwarded supp service notice.
Test: Test Harness
Bug: 33761801
Merged-In: I5503232f90b3255df601be3f16443e8ae311a479
Change-Id: I8ffc8079b43c54594e596f29cec641ca051d4796
2017-09-20 10:02:02 -07:00
Tyler Gunn
e9187977e4 De-couple data enabled from VT settings.
The existing KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS has the impact
of decoupling whether VT is enabled from whether mobile data is enabled.
Making this TRUE by default.
Adding a new carrier config option to indicate whether VILTE data is metered.
This, coupled with KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS allows
us to ensure that wifi video calls can be made, while still ensuring that
mobile data is not used for VT calls.
A carrier config update needs to be made for the few instances where
KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS was set true to ensure
that KEY_VILTE_DATA_IS_METERED_BOOL is false in that case.

Test: Manual
Bug: 36900451
Merged-In: I424cd828a7616c2947367bdb4a82a62cf17847e7
Change-Id: I037f8930901907b55e4245a655e0480668549185
2017-09-20 15:32:10 +00:00
Pengquan Meng
b94f5bccd5 Merge "Incorrect decoding when TP-OA contains non-integer information" am: 2bcc7fac89 am: 74bd3daaac am: b3bc234dfa
am: f05a01caf3

Change-Id: I817598283a95460cebd6890ddcc44950d630d7c0
2017-09-19 01:44:24 +00:00
Pengquan Meng
f05a01caf3 Merge "Incorrect decoding when TP-OA contains non-integer information" am: 2bcc7fac89 am: 74bd3daaac
am: b3bc234dfa

Change-Id: I5df968dbf00665d3bfdd451dc4e03fda055c371a
2017-09-19 01:38:10 +00:00
Pengquan Meng
74bd3daaac Merge "Incorrect decoding when TP-OA contains non-integer information"
am: 2bcc7fac89

Change-Id: I4bddee5b8cf19715db56e7286a05f76be530928d
2017-09-19 01:23:53 +00:00
Erika Avenberg
0be6d7cbd8 Incorrect decoding when TP-OA contains non-integer information
When receiving a GSM SMS message where the TP-Originating-Address
(TP-OA) field contains non-integer information, it is currently
decoded incorrectly.

This CL adds support for decoding BCD according to spec:
ETSI TS 123 040 V9.3.0

Section: 9.1.2.3 Semi-octet representation
"If a mobile receives an address field containing non-integer
 information in the semi-octets other than "1111" (e.g. 1110)
 it shall display the semi-octet as the representation given
 in GSM 44.008 [12] under "called BCD number", viz 1010="*",
 1011="#", 1100="a", 1101="b", 1110="c"."

Bug: 65042708
Test: runtest --path frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/GsmSmsTest.java --test-method testAddressing
Change-Id: Ied2d6ca4d84d5c3ca6cc5c4d9875d2ff2a8e5df9
2017-09-18 15:21:08 -07:00
Hall Liu
e77a09c7ae Merge "API council suggested edits, part 3" am: 7a4cc05d45 am: 4c4fb3bdfb am: 7fd9aa2654
am: 3715bced3a

Change-Id: Ie4dacc599a561e60f40e5ef26f03aa7ef19fbda8
2017-09-15 14:04:33 +00:00
Hall Liu
3812601906 Merge "Apply suggested edits to the file-download API" am: f6c9baa0cd am: 3934c475ce am: febecb8218
am: 3e0f22f676

Change-Id: I4c10058445c1252447f2cd5889bb35f425efa468
2017-09-15 14:00:18 +00:00